Skip to content

Commit

Permalink
comment from review
Browse files Browse the repository at this point in the history
  • Loading branch information
jsrain committed Jan 7, 2015
1 parent 73433f5 commit 3da387d
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions library/system/src/modules/Kernel.rb
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ def ExtractCmdlineParameters(line)

# get rid of live-installer-specific parameters
if Mode.live_installation
discardlist.push("initrd", "ramdisk_size", "ramdisk_blocksize", "liveinstall", "splash", "quiet", "vga", "lang")
discardlist.push("initrd", "ramdisk_size", "ramdisk_blocksize", "liveinstall", "splash", "quiet", "lang")
end

# backdoor to re-enable update on UL/SLES
Expand Down Expand Up @@ -252,10 +252,11 @@ 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
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(
Expand Down

0 comments on commit 3da387d

Please sign in to comment.