Author: jsuchome Date: Thu May 6 12:51:44 2010 New Revision: 61955 URL: http://svn.opensuse.org/viewcvs/yast?rev=61955&view=rev Log: - Console.ycp: find out if the baud rate was not given (bnc#602743) - 2.17.47 Modified: branches/SuSE-Code-11-SP1-Branch/country/VERSION branches/SuSE-Code-11-SP1-Branch/country/console/src/Console.ycp branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes Modified: branches/SuSE-Code-11-SP1-Branch/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/country/VERSION?rev=61955&r1=61954&r2=61955&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/country/VERSION Thu May 6 12:51:44 2010 @@ -1 +1 @@ -2.17.46 +2.17.47 Modified: branches/SuSE-Code-11-SP1-Branch/country/console/src/Console.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/country/console/src/Console.ycp?rev=61955&r1=61954&r2=61955&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/console/src/Console.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/country/console/src/Console.ycp Thu May 6 12:51:44 2010 @@ -30,6 +30,7 @@ { module "Console"; + import "Kernel"; import "Mode"; import "Language"; import "Linuxrc"; @@ -137,7 +138,17 @@ * upgrade: disable old entries for serial console */ SCR::Execute (.target.bash,"sed -i '/^\\(hvc\\|hvsi\\|S[0-9]\\)/s@^.*@#&@' /etc/inittab"); - SCR::Execute (.target.bash,"grep -E '^cons:' /etc/inittab || /bin/echo 'cons:12345:respawn:/sbin/smart_agetty -L 42 console' >> /etc/inittab"); + + // find out if the baud rate is not present on kernel line (bnc#602743) + string rate = "42"; + foreach (string part, splitstring (Kernel::GetCmdLine (), "\t "), { + if (substring (part, 0, 8) == "console=" && issubstring (part, ",")) + { + rate = splitstring (part, ",")[1]:rate; + } + }); + + SCR::Execute (.target.bash, sformat ("grep -E '^cons:' /etc/inittab || /bin/echo 'cons:12345:respawn:/sbin/smart_agetty -L %1 console' >> /etc/inittab", rate)); SCR::Execute (.target.bash,"grep -Ew ^console /etc/securetty || /bin/echo console >> /etc/securetty"); } } Modified: branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes?rev=61955&r1=61954&r2=61955&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes Thu May 6 12:51:44 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu May 6 11:40:31 CEST 2010 - jsuchome@suse.cz + +- Console.ycp: find out if the baud rate was not given (bnc#602743) +- 2.17.47 + +------------------------------------------------------------------- Thu Apr 15 09:05:51 CEST 2010 - jsuchome@suse.cz - before updating boot menu, switch the UI language (bnc#446982) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org