Author: jsrain Date: Tue Feb 8 16:45:33 2011 New Revision: 63372 URL: http://svn.opensuse.org/viewcvs/yast?rev=63372&view=rev Log: do not define splash screen resolution to mkinitrd if boot splash is not installed (bnc#670225) Modified: trunk/yast2/VERSION trunk/yast2/library/system/src/Initrd.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=63372&r1=63371&r2=63372&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Tue Feb 8 16:45:33 2011 @@ -1 +1 @@ -2.20.11 +2.20.12 Modified: trunk/yast2/library/system/src/Initrd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/system/src/Initrd.ycp?rev=63372&r1=63371&r2=63372&view=diff ============================================================================== --- trunk/yast2/library/system/src/Initrd.ycp (original) +++ trunk/yast2/library/system/src/Initrd.ycp Tue Feb 8 16:45:33 2011 @@ -405,8 +405,11 @@ SCR::Write (.sysconfig.kernel, nil); // recreate initrd string param = ""; - if (splash != "" && splash != nil) + if (splash != "" && splash != nil + && 0 < (integer)SCR::Read (.target.size, "/lib/mkinitrd/scripts/setup-splash.sh")) + { param = sformat ("-s %1", splash); + } if ( SCR::Execute (.target.bash, sformat ("/sbin/mkinitrd %1 %2 >> \ %3 2>&1", param, additional_parameters, Directory::logdir + "/y2logmkinitrd")) != 0 ) Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=63372&r1=63371&r2=63372&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Feb 8 16:45:33 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 8 16:37:35 CET 2011 - jsrain@suse.cz + +- do not define splash screen resolution to mkinitrd if boot splash + is not installed (bnc#670225) +- 2.20.12 + +------------------------------------------------------------------- Wed Jan 19 13:49:18 CET 2011 - jsrain@suse.cz - adaptations for unattended migration (fate#310481) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org