From ccdf9cd298e14926c636b6afc3a02ce8713cb34a 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/system/src/modules/Kernel.rb b/library/system/src/modules/Kernel.rb index a25339290..12060b606 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")).empty? # 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")) + SCR.Read(path(".target.string"), "/proc/cmdline").to_s else - Convert.to_string(SCR.Read(path(".etc.install_inf.Cmdline"))) + SCR.Read(path(".etc.install_inf.Cmdline")).to_s end Builtins.y2milestone(