Skip to content

Fix error when doing password hashing for aarch64 offline image builds #10111

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
dmcilvaney merged 3 commits into from
Aug 12, 2024
Merged

Fix error when doing password hashing for aarch64 offline image builds #10111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47803be
Restore openssl to build chroot
dmcilvaney Aug 12, 2024
f451d29
Add more details to image config md for user passwords
dmcilvaney Aug 12, 2024
94552c5
Update toolkit/docs/formats/imageconfig.md
dmcilvaney Aug 12, 2024
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
6 changes: 4 additions & 2 deletions toolkit/docs/formats/imageconfig.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ The table below are the keys for the users.
|Name |string |Cannot be empty
|UID |string |Must be in range 0-60000
|PasswordHashed |bool |
|Password |string |
|Password |string |If 'PasswordHashed=true', use `openssl passwd ...` to generate the password hash
|PasswordExpiresDays|number |Must be in range 0-99999 or -1 for no expiration
|SSHPubKeyPaths |array of strings |
|PrimaryGroup |string |
Expand All @@ -566,7 +566,9 @@ An example usage for users "root" and "basicUser" would look like:
"Users": [
{
"Name": "root",
"Password": "somePassword"
"PasswordHashed": true,
"Password": "$6$<SALT>$<HASHED PASSWORD>",
"_comment": "Generated with `openssl passwd -6 -salt <SALT> <PASSWORD>`",
},
{
"Name": "basicUser",
Expand Down
1 change: 1 addition & 0 deletions toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ gtk-doc-1.33.2-1.azl3.noarch.rpm
autoconf-2.72-2.azl3.noarch.rpm
automake-1.16.5-2.azl3.noarch.rpm
ocaml-srpm-macros-9-4.azl3.noarch.rpm
openssl-3.3.0-2.azl3.aarch64.rpm
openssl-devel-3.3.0-2.azl3.aarch64.rpm
openssl-libs-3.3.0-2.azl3.aarch64.rpm
openssl-perl-3.3.0-2.azl3.aarch64.rpm
Expand Down
1 change: 1 addition & 0 deletions toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ gtk-doc-1.33.2-1.azl3.noarch.rpm
autoconf-2.72-2.azl3.noarch.rpm
automake-1.16.5-2.azl3.noarch.rpm
ocaml-srpm-macros-9-4.azl3.noarch.rpm
openssl-3.3.0-2.azl3.x86_64.rpm
openssl-devel-3.3.0-2.azl3.x86_64.rpm
openssl-libs-3.3.0-2.azl3.x86_64.rpm
openssl-perl-3.3.0-2.azl3.x86_64.rpm
Expand Down