From 4a9b0939e354e625acad56c2ceb2210d7f6a0c3e Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Sun, 21 Jan 2024 21:41:15 +0100 Subject: [PATCH] modify behavior of Kernel to works better in agama without install.inf --- library/system/src/modules/Kernel.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/library/system/src/modules/Kernel.rb b/library/system/src/modules/Kernel.rb index a25339290..024d25630 100644 --- a/library/system/src/modules/Kernel.rb +++ b/library/system/src/modules/Kernel.rb @@ -169,13 +169,13 @@ def ParseInstallationKernelCmdline @cmdline_parsed = true return if !(Stage.initial || Stage.cont) - # live installation does not create /etc/install.inf (bsc#793065) - tmp = if Mode.live_installation + # Check if /etc/install.inf exists + tmp = if SCR.Dir(path("etc.install_inf")) + SCR.Read(path(".etc.install_inf.Cmdline")).to_s + else # 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 - Convert.to_string(SCR.Read(path(".target.string"), "/proc/cmdline")) - else - Convert.to_string(SCR.Read(path(".etc.install_inf.Cmdline"))) + SCR.Read(path(".target.string"), "/proc/cmdline").to_s end Builtins.y2milestone(