Author: lslezak Date: Thu Sep 8 11:23:58 2011 New Revision: 65598 URL: http://svn.opensuse.org/viewcvs/yast?rev=65598&view=rev Log: - read biosdevname option directly from /proc/cmdline (bnc#712049) - 2.17.92 Modified: branches/SuSE-Code-11-SP2-Branch/packager/VERSION branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp Modified: branches/SuSE-Code-11-SP2-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/VERSION?rev=65598&r1=65597&r2=65598&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/VERSION Thu Sep 8 11:23:58 2011 @@ -1 +1 @@ -2.17.91 +2.17.92 Modified: branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes?rev=65598&r1=65597&r2=65598&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes Thu Sep 8 11:23:58 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Sep 8 09:12:40 UTC 2011 - lslezak@suse.cz + +- read biosdevname option directly from /proc/cmdline (bnc#712049) +- 2.17.92 + +------------------------------------------------------------------- Fri Sep 2 12:28:58 UTC 2011 - lslezak@suse.cz - intialize the target in the second stage to read the GPG keys, Modified: branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp?rev=65598&r1=65597&r2=65598&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp Thu Sep 8 11:23:58 2011 @@ -783,31 +783,24 @@ { list<string> ret = []; - string biosdevname = (string)SCR::Read(.etc.install_inf.biosdevname); - y2milestone("read biosdevname option: %1", biosdevname); boolean add_biosdevname = false; + string cmdline = (string)SCR::Read(.target.string, "/proc/cmdline"); - if (biosdevname == "1") - { - y2milestone("Found biosdevname=1 kernel option, selecting biosdevname package to install"); - add_biosdevname = true; - } - else - { - string cmdline = (string)SCR::Read(.target.string, "/proc/cmdline"); + list<string> options = splitstring(cmdline, " \t"); - if (!issubstring(cmdline, "biosdevname")) - { - y2milestone("Missing biosdevname option, autodetecting..."); - if (DellSystem()) - { - add_biosdevname = true; - } - } - else - { - y2milestone("biosdevname disabled via kernel option, NOT selecting biosdevname package to install"); - } + if (contains(options, "biosdevname=1")) { + y2milestone("Biosdevname explicitly enabled"); + add_biosdevname = true; + } + else if (contains(options, "biosdevname=0")) { + y2milestone("Biosdevname explicitly disabled"); + add_biosdevname = false; + } + else { + y2milestone("Missing biosdevname option, autodetecting..."); + if (DellSystem()) { + add_biosdevname = true; + } } if (add_biosdevname) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org