Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion service/lib/agama/cmdline_args.rb
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def self.read_from(path)
# 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.")
return option if !option.start_with?("agama.")

option.sub("agama.", CMDLINE_PREFIX)
end
Expand Down
5 changes: 5 additions & 0 deletions service/test/agama/cmdline_args_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,10 @@
args = described_class.read_from(File.join(workdir, "/run/agama/cmdline.d/agama.conf"))
expect(args.data["install_url"]).to eq("cd:/?devices=/dev/sr1")
end

it "properly parse values starting with inst" do
args = described_class.read_from(File.join(workdir, "/run/agama/cmdline.d/agama.conf"))
expect(args.data["install_url"]).to eq("cd:/?devices=/dev/sr1")
end
end
end
Original file line number Diff line number Diff line change
@@ -1 +1 @@
agama.config_url=http://example.org/agama.yaml agama.web.ssl=true agama.install_url=cd:/?devices=/dev/sr1 agama.auto=http://mydomain.org/tumbleweed.jsonnet
agama.config_url=http://example.org/agama.yaml agama.web.ssl=true inst.install_url=cd:/?devices=/dev/sr1 agama.auto=http://mydomain.org/tumbleweed.jsonnet