Skip to content

Fixed sshPublicKey note in autoyast_compat.json #3293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mchf merged 4 commits into from
Mar 17, 2026
Merged

Fixed sshPublicKey note in autoyast_compat.json #3293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c469df9
Fixed sshPublicKey note in autoyast_compat.json
mchf Mar 17, 2026
0c12a4c
Fixed conversion of authorized_keys in root reader
mchf Mar 17, 2026
c8cf3f2
Updated changelog
mchf Mar 17, 2026
c7db2ae
Fixed ruby tests
mchf Mar 17, 2026
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
9 changes: 9 additions & 0 deletions rust/package/agama.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Mar 17 14:49:14 UTC 2026 - Michal Filka <mfilka@suse.com>

- jsc#PED-15434
- fixed autoyast_compat.json to cover earlier patch which
extended capabilities of sshPublicKey / sshPublicKeys
- fixed AY root_reader. authorized_keys are converted as an array
into sshPublicKeys now (no first key only anymore)

-------------------------------------------------------------------
Tue Mar 17 12:15:22 UTC 2026 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>

Expand Down
3 changes: 0 additions & 3 deletions service/lib/agama/autoyast/root_reader.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ def config
def setup_ssh(root_user)
hsh = {}

public_key = root_user.authorized_keys.first

hsh["sshPublicKey"] = public_key if public_key
hsh["sshPublicKeys"] = root_user.authorized_keys unless root_user.authorized_keys.empty?

hsh
Expand Down
7 changes: 1 addition & 6 deletions service/share/autoyast-compat.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,12 +666,7 @@
"agama": "user.hashedPassword",
"notes": "If set to true, it uses \"hashedPassword\" instead of \"password\""
},
{
"key": "authorized_keys",
"support": "yes",
"agama": "root.sshPublicKey",
"notes": "It only considers a single key."
}
{ "key": "authorized_keys", "support": "yes", "agama": "root.sshPublicKeys" }
]
},
{ "key": "zfcp", "support": "yes" }
Expand Down
2 changes: 1 addition & 1 deletion service/test/agama/autoyast/converter_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
it "exports the root password and/or public SSH key" do
result = subject.to_agama(profile)
expect(result["root"]).to include("password" => "nots3cr3t",
"sshPublicKey" => "ssh-rsa ...")
"sshPublicKeys" => ["ssh-rsa ..."])
end
end

Expand Down
1 change: 0 additions & 1 deletion service/test/agama/autoyast/root_reader_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
root = subject.read["root"]
expect(root).to eq(
"password" => "123456",
"sshPublicKey" => "ssh-key 1",
"sshPublicKeys" => ["ssh-key 1", "ssh-key 2"]
)
end
Expand Down
Loading