Skip to content

Commit 71a14dd

Browse files
authored
Fix error when doing password hashing for aarch64 offline image builds (#10111)
1 parent 9ccf3dc commit 71a14dd

3 files changed

Lines changed: 6 additions & 2 deletions

File tree

toolkit/docs/formats/imageconfig.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ The table below are the keys for the users.
552552
|Name |string |Cannot be empty
553553
|UID |string |Must be in range 0-60000
554554
|PasswordHashed |bool |
555-
|Password |string |
555+
|Password |string |If 'PasswordHashed=true', use `openssl passwd ...` to generate the password hash
556556
|PasswordExpiresDays|number |Must be in range 0-99999 or -1 for no expiration
557557
|SSHPubKeyPaths |array of strings |
558558
|PrimaryGroup |string |
@@ -566,7 +566,9 @@ An example usage for users "root" and "basicUser" would look like:
566566
"Users": [
567567
{
568568
"Name": "root",
569-
"Password": "somePassword"
569+
"PasswordHashed": true,
570+
"Password": "$6$<SALT>$<HASHED PASSWORD>",
571+
"_comment": "Generated with `openssl passwd -6 -salt <SALT> <PASSWORD>`",
570572
},
571573
{
572574
"Name": "basicUser",

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ gtk-doc-1.33.2-1.azl3.noarch.rpm
167167
autoconf-2.72-2.azl3.noarch.rpm
168168
automake-1.16.5-2.azl3.noarch.rpm
169169
ocaml-srpm-macros-9-4.azl3.noarch.rpm
170+
openssl-3.3.0-2.azl3.aarch64.rpm
170171
openssl-devel-3.3.0-2.azl3.aarch64.rpm
171172
openssl-libs-3.3.0-2.azl3.aarch64.rpm
172173
openssl-perl-3.3.0-2.azl3.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ gtk-doc-1.33.2-1.azl3.noarch.rpm
167167
autoconf-2.72-2.azl3.noarch.rpm
168168
automake-1.16.5-2.azl3.noarch.rpm
169169
ocaml-srpm-macros-9-4.azl3.noarch.rpm
170+
openssl-3.3.0-2.azl3.x86_64.rpm
170171
openssl-devel-3.3.0-2.azl3.x86_64.rpm
171172
openssl-libs-3.3.0-2.azl3.x86_64.rpm
172173
openssl-perl-3.3.0-2.azl3.x86_64.rpm

0 commit comments

Comments
 (0)