diff --git a/autoinstallation/bin/agama-auto b/autoinstallation/bin/agama-auto index 01493a4fa5..30bf2bed3d 100755 --- a/autoinstallation/bin/agama-auto +++ b/autoinstallation/bin/agama-auto @@ -5,7 +5,7 @@ set -ex export YAST_SKIP_XML_VALIDATION=1 if [ -z "$1" ]; then - url=$(grep 'agama.auto=' "${INFO_CONTENT}" # remove info param - sed -in 's/\([[:space:]]\|^\)agama\.info=[^[:space:]]\+//' "${TARGET}" + sed -in 's/\([[:space:]]\|^\)\(inst\|agama\)\.info=[^[:space:]]\+//' "${TARGET}" # and add content of info file cat "${INFO_CONTENT}" >> "${TARGET}" diff --git a/live/root/usr/bin/kernel-cmdline-conf.sh b/live/root/usr/bin/kernel-cmdline-conf.sh index a34ea9a620..c112cd6c54 100755 --- a/live/root/usr/bin/kernel-cmdline-conf.sh +++ b/live/root/usr/bin/kernel-cmdline-conf.sh @@ -16,7 +16,7 @@ write_kernel_args() { case ${_i} in # remove all agama kernel params # Add here also all linuxrc supported parameters - LIBSTORAGE_* | YAST_* | agama* | Y2* | ZYPP_* | autoyast* ) + LIBSTORAGE_* | YAST_* | inst* | agama* | Y2* | ZYPP_* | autoyast* ) _found=1 ;; esac diff --git a/live/root/usr/lib/dracut/modules.d/99agama-cmdline/agama-cmdline-conf.sh b/live/root/usr/lib/dracut/modules.d/99agama-cmdline/agama-cmdline-conf.sh index 00b759168b..0eec1e36b6 100755 --- a/live/root/usr/lib/dracut/modules.d/99agama-cmdline/agama-cmdline-conf.sh +++ b/live/root/usr/lib/dracut/modules.d/99agama-cmdline/agama-cmdline-conf.sh @@ -15,7 +15,7 @@ get_agama_args() { _found=1 _env=1 ;; - agama*) + inst* | agama*) _found=1 ;; esac diff --git a/service/lib/agama/cmdline_args.rb b/service/lib/agama/cmdline_args.rb index 778cde2e45..19f02a3050 100644 --- a/service/lib/agama/cmdline_args.rb +++ b/service/lib/agama/cmdline_args.rb @@ -22,7 +22,8 @@ module Agama # This class is responsible for reading Agama kernel cmdline options class CmdlineArgs - CMDLINE_PREFIX = "agama." + CMDLINE_PATH = "/proc/cmdline" + CMDLINE_PREFIX = "inst." attr_accessor :config_url attr_reader :data @@ -46,6 +47,7 @@ def self.read_from(path) options = File.read(path) options.split.each do |option| + option = standardize(option) next unless option.start_with?(CMDLINE_PREFIX) key, value = option.split("=", 2) @@ -68,6 +70,15 @@ def self.read_from(path) args end + # Despite Agama is young it already contains some relicts. This method should purge them and put + # command line options into a standard shape + def self.standardize(option) + # agama. is now obsolete original kernel argument prefix + return if !option.start_with?("agama.") + + option.sub("agama.", CMDLINE_PREFIX) + end + # Convenience method to normalize the given value by now it just convert "true" and "false" # strings to {Boolean}s # diff --git a/service/package/rubygem-agama-yast.changes b/service/package/rubygem-agama-yast.changes index 748af2a62c..fa370628c7 100644 --- a/service/package/rubygem-agama-yast.changes +++ b/service/package/rubygem-agama-yast.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 19 17:54:19 UTC 2025 - Michal Filka + +- Instead of "agama." use more generic "inst." prefix for kernel + boot options controling the agama installer + ------------------------------------------------------------------- Wed Feb 19 14:21:40 UTC 2025 - Josef Reidinger @@ -11,7 +17,6 @@ Wed Feb 19 13:35:07 UTC 2025 - Ladislav Slezák - UX: Improve the libzypp callbacks (gh#agama-project/agama#1985) - ------------------------------------------------------------------- Tue Feb 18 17:19:08 UTC 2025 - Knut Anderssen