Author: jsuchome Date: Fri Jun 25 10:56:48 2010 New Revision: 62155 URL: http://svn.opensuse.org/viewcvs/yast?rev=62155&view=rev Log: - Console.ycp: correct parsing of the kernel line (bnc#604699) - 2.19.17 Modified: trunk/country/VERSION trunk/country/console/src/Console.ycp trunk/country/package/yast2-country.changes Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=62155&r1=62154&r2=62155&view=diff ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Fri Jun 25 10:56:48 2010 @@ -1 +1 @@ -2.19.16 +2.19.17 Modified: trunk/country/console/src/Console.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/console/src/Console.ycp?rev=62155&r1=62154&r2=62155&view=diff ============================================================================== --- trunk/country/console/src/Console.ycp (original) +++ trunk/country/console/src/Console.ycp Fri Jun 25 10:56:48 2010 @@ -140,14 +140,15 @@ SCR::Execute (.target.bash,"sed -i '/^\\(hvc\\|hvsi\\|S[0-9]\\)/s@^.*@#&@' /etc/inittab"); // find out if the baud rate is not present on command line (bnc#602743) - string rate = "42"; + integer rate = 42; foreach (string part, splitstring (Kernel::GetCmdLine (), "\t "), { if (substring (part, 0, 11) == "console=tty" && issubstring (part, ",")) { - rate = splitstring (part, ",")[1]:rate; + string srate = splitstring (part, ",")[1]:"42"; + rate = tointeger (srate); // "bbbbpnf" -> bbbb, where 'b' is number and 'p' character } }); - + if (rate == nil) rate = 42; 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: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.changes?rev=62155&r1=62154&r2=62155&view=diff ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Fri Jun 25 10:56:48 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jun 25 10:47:20 CEST 2010 - jsuchome@suse.cz + +- Console.ycp: correct parsing of the kernel line (bnc#604699) +- 2.19.17 + +------------------------------------------------------------------- Thu May 27 08:28:48 CEST 2010 - jsuchome@suse.cz - use Dutch keyboard layout as a default for Dutch (bnc#603955) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org