Author: juhliarik Date: Thu Aug 14 15:57:41 2008 New Revision: 50080 URL: http://svn.opensuse.org/viewcvs/yast?rev=50080&view=rev Log: - added support for creating console arg for kernel (fate #304499) - new version 2.17.13 M bootloader/src/config/bootloader.rnc * added new key for section "console" M bootloader/src/modules/BootCommon.ycp * added calling addConsole() M bootloader/src/routines/misc.ycp * added new functions for buildig creating and adding new console key to section M bootloader/yast2-bootloader.spec.in * update dependences Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/config/bootloader.rnc trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/routines/misc.ycp trunk/bootloader/yast2-bootloader.spec.in Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=50080&r1=50079&r2=50080&view=diff ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Thu Aug 14 15:57:41 2008 @@ -1 +1 @@ -2.17.12 +2.17.13 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=50080&r1=50079&r2=50080&view=diff ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Thu Aug 14 15:57:41 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Aug 14 15:16:04 CEST 2008 - juhliarik@suse.cz + +- added support for creating console for kernel args (fate #110038) +- 2.17.13 + +------------------------------------------------------------------- Wed Aug 13 14:36:59 CEST 2008 - juhliarik@suse.cz - added changes for pesistent device names (fate #302219) Modified: trunk/bootloader/src/config/bootloader.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/config/bootloader.rnc?rev=50080&r1=50079&r2=50080&view=diff ============================================================================== --- trunk/bootloader/src/config/bootloader.rnc (original) +++ trunk/bootloader/src/config/bootloader.rnc Thu Aug 14 15:57:41 2008 @@ -75,6 +75,7 @@ element section { element append {text}? & element initial {text}? & + element console {text}? & element initrd {text}? & element kernel {text}? & element name {text}? & Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommon.ycp?rev=50080&r1=50079&r2=50080&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Thu Aug 14 15:57:41 2008 @@ -782,13 +782,16 @@ BootCommon::UpdateAppend (); BootCommon::UpdateGfxMenu (); } + boolean ret = true; string bl = getLoaderType (false); if (bl == "none") return true; InitializeLibrary (init, bl); - + // FATE: #110038: Serial console + // check and add console key with value for sections + addConsole(); list > sects = maplist (map s, sections, { return (map) filter (string k, any v, s, { return is (v, string); }); Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp?rev=50080&r1=50079&r2=50080&view=diff ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Thu Aug 14 15:57:41 2008 @@ -2004,5 +2004,160 @@ return ""; } +/** FATE #303548 - Grub: limit device.map to devices detected by BIOS Int 13 + * Function select boot device - disk + * + * @return string name of boot device - disk + */ + + +/** FATE #110038: Serial console + * Function build value for console from: + * @param string unit no of console + * @param string speed + * @param string parity (n,o,e) + * @param string word (8) + * @return string value of console for kernel append + */ +define string buildConsoleValue (string unit, string speed, string parity, string word) +{ + string ret = ""; + if ((unit != "") && (speed != "")) + { + // add number of serial console + ret = "ttyS" + unit; + // add speed + ret = ret + "," + speed; + if (parity != "") + { + // add parity + switch (parity) + { + case ("no"): + ret = ret + "n"; + break; + case ("odd"): + ret = ret +"o"; + break; + case ("even"): + ret = ret + "e"; + break; + default: + ret = ret + "n"; + break; + } + + // add word + if (word != "") + ret = ret + word; + } + y2milestone("console value for kernel: %1", ret); + } else { + y2error("Wrong values unit: %1 , speed: %2 , parity: %3 , word: %4", + unit, speed, parity, word); + } + return ret; +} + + +/** FATE #110038: Serial console + * Function parse string key (e.g. --speed=9600) + * and return value of key + * @param string key e.g. --unit=0 + * @return string value of key + */ + + +define string getKeyValue(string key) +{ + string ret = ""; + list <string> value = []; + if (key != "") + { + value = splitstring (key, "="); + if (value[1]:"" != "") + ret = value[1]:""; + } + + y2debug("parse: %1 and return value: %2", key, ret); + return ret; +} + + +/** FATE #110038: Serial console + * Function check value from globals (serial and terminal) + * after that build value of console append for kernel if it is possible + * @return string value of console for kernel append + */ + +define string getConsoleValue() +{ + string ret = ""; + if ((globals["serial"]:"" != "") && (globals["terminal"]:"" != "")) + { + list <string> list_serial = splitstring (globals["serial"]:"", " "); + y2milestone("list of serial args: %1", list_serial); + string unit = ""; + string speed = ""; + string parity = ""; + string word = ""; + foreach(string key, list_serial, + { + if (search(key, "--unit") != nil) + unit = getKeyValue(key); + + if (search(key, "--speed") != nil) + speed = getKeyValue(key); + + if (search(key, "--parity") != nil) + parity = getKeyValue(key); + + if (search(key, "--word") != nil) + word = getKeyValue(key); + + }); + // build value + ret = buildConsoleValue (unit, speed, parity, word); + } + + return ret; +} + + +/** FATE #110038: Serial console + * Add console arg for kernel if there is defined serial console + * - add key console with value to section type image and xen + */ + +define void addConsole() +{ + string console_value = getConsoleValue(); + if ((console_value != "") && (console_value != nil)) + { + + // list of idexes from sections where is image or xen + list < integer > list_index =[]; + // counter + integer index = -1; + foreach(map section, sections, + { + index = index +1; + if ((section["type"]:"" == "image") || (search(section["type"]:"", "xen") != nil)) + list_index = add(list_index, index); + }); + + // add key console with value + if (size(list_index) > 0) + { + foreach (integer idx, list_index, + { + sections[idx, "console"] = console_value; + y2debug("Added console for section: %1", sections[idx]:$[]); + }); + } + + } +} + } //end of include Modified: trunk/bootloader/yast2-bootloader.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/yast2-bootloader.spec.in?rev=50080&r1=50079&r2=50080&view=diff ============================================================================== --- trunk/bootloader/yast2-bootloader.spec.in (original) +++ trunk/bootloader/yast2-bootloader.spec.in Thu Aug 14 15:57:41 2008 @@ -6,7 +6,7 @@ #!BuildIgnore: autoyast2-installation PreReq: /bin/sed %fillup_prereq # Installation::*version variables -Requires: yast2 >= 2.16.7 +Requires: yast2 >= 2.17.0 Requires: yast2-core yast2-storage perl-Bootloader parted perl-Compress-Zlib limal-perl %ifarch %ix86 x86_64 Requires: master-boot-code -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org