Merge pull request #312 from jsrain/bnc793065

keep kernel cmdline options during live installation (bsc#793065)

library/system/src/modules/Kernel.rb

@@ -214,6 +214,11 @@ def ExtractCmdlineParameters(line)
         discardlist = Builtins.add(discardlist, "ramdisk_size")
       end
 
+      # get rid of live-installer-specific parameters
+      if Mode.live_installation
+        discardlist.push("initrd", "ramdisk_size", "ramdisk_blocksize", "liveinstall", "splash", "quiet", "lang")
+      end
+
       # backdoor to re-enable update on UL/SLES
       if Builtins.contains(cmdlist, "suse_update")
         discardlist = Builtins.add(discardlist, "suse_update")
@@ -247,7 +252,14 @@ def ExtractCmdlineParameters(line)
     def ParseInstallationKernelCmdline
       @cmdline_parsed = true
       return if !(Stage.initial || Stage.cont)
-      tmp = Convert.to_string(SCR.Read(path(".etc.install_inf.Cmdline")))
+      # live installation does not create /etc/install.inf (bsc#793065)
+      if Mode.live_installation
+        # not using dedicated agent in order to use the same parser for cmdline
+        # independently on whether it comes from /proc/cmdline or /etc/install.inf
+        tmp = Convert.to_string(SCR.Read(path(".target.string"), "/proc/cmdline"))
+      else
+        tmp = Convert.to_string(SCR.Read(path(".etc.install_inf.Cmdline")))
+      end
 
       Builtins.y2milestone(
         "cmdline from install.inf is: %1",

package/yast2.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan  7 10:55:13 UTC 2015 - jsrain@suse.cz
+
+- keep kernel cmdline options during live installation (bsc#793065)
+
 -------------------------------------------------------------------
 Thu Dec 18 19:55:46 UTC 2014 - lslezak@suse.cz