Author: juhliarik Date: Mon Jul 19 16:03:48 2010 New Revision: 62270 URL: http://svn.opensuse.org/viewcvs/yast?rev=62270&view=rev Log: added patch for L3 to branch Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootArch.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION?rev=62270&r1=62269&r2=62270&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION Mon Jul 19 16:03:48 2010 @@ -1 +1 @@ -2.13.164 +2.13.164.1 Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes?rev=62270&r1=62269&r2=62270&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes Mon Jul 19 16:03:48 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu May 20 15:09:23 CEST 2010 - juhliarik@suse.cz + +- L3: added fix for adding cio_ignore to zipl.conf (bnc#604808) +- 2.13.164.1 + +------------------------------------------------------------------- Fri Jul 31 12:28:34 CEST 2009 - juhliarik@suse.cz - added fix for using persistent device names (bnc#524547) Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootArch.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootArch.ycp?rev=62270&r1=62269&r2=62270&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootArch.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootArch.ycp Mon Jul 19 16:03:48 2010 @@ -38,6 +38,32 @@ return "/boot/initrd"; } +/** bnc#604808 cio_ignore parameter does not get transfered to installed system after installation + * Add kernel args from installatio to zipl.conf + * + * @param string of arguments from installation + * @return string of arguments + */ + +string InstKernelParamsFromCmdline(string CmdLine) +{ + string ret = ""; + if (CmdLine == "") + { + y2milestone("Command line kernel args was not defined"); + return ret; + } + + list <string> CmdLineArgs = splitstring (CmdLine, " "); + foreach(string arg, CmdLineArgs, + { + if (search(tolower(arg),"cio_ignore") != nil) + ret = ret + " " + arg; + }); + y2milestone("zipl should be appended by: %1", ret); + return ret; +} + /** * Get parameters for the default kernel * @param resume string device to resume from (or empty not to set it) @@ -90,6 +116,8 @@ StorageControllers::dasdParam, features, termparm); + // bnc#604808 cio_ignore parameter does not get transfered to installed system after installation + parameters = parameters + InstKernelParamsFromCmdline(kernel_cmdline); return parameters; } else -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org