From c513f087190b23513ccbab2dfcd89264ec97f9f5 Mon Sep 17 00:00:00 2001 From: Achilleas Koutsou Date: Tue, 6 Sep 2022 11:45:53 +0200 Subject: [PATCH] test/ostree-raw: move user from commit to deployment Instead of defining users in the ostree commits, create them during the deployment and creation of the raw image. Defining users in commits locks them into the base system: they can't be removed and their password can't be changed without creating an upgrade commit and they will always be part of the initial system. Also, in Fedora 37, password authentication for users in commits is not working. --- test/cases/ostree-raw-image.sh | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/test/cases/ostree-raw-image.sh b/test/cases/ostree-raw-image.sh index 2cf61039a..b34fb91fc 100755 --- a/test/cases/ostree-raw-image.sh +++ b/test/cases/ostree-raw-image.sh @@ -285,14 +285,6 @@ version = "*" [[packages]] name = "sssd" version = "*" - -[[customizations.user]] -name = "admin" -description = "Administrator account" -password = "\$6\$GRmb7S0p8vsYmXzH\$o0E020S.9JQGaHkszoog4ha4AQVs3sk8q0DvLjSMxoxHBKnB2FBXGQ/OkwZQfW/76ktHd0NX5nls2LPxPuUdl." -key = "${SSH_KEY_PUB}" -home = "/home/admin/" -groups = ["wheel"] EOF # No RT kernel in Fedora @@ -365,6 +357,14 @@ description = "A rhel-edge raw image" version = "0.0.1" modules = [] groups = [] + +[[customizations.user]] +name = "admin" +description = "Administrator account" +password = "\$6\$GRmb7S0p8vsYmXzH\$o0E020S.9JQGaHkszoog4ha4AQVs3sk8q0DvLjSMxoxHBKnB2FBXGQ/OkwZQfW/76ktHd0NX5nls2LPxPuUdl." +key = "${SSH_KEY_PUB}" +home = "/home/admin/" +groups = ["wheel"] EOF greenprint "📄 raw image blueprint" @@ -559,13 +559,6 @@ version = "*" [[packages]] name = "wget" version = "*" - -[[customizations.user]] -name = "admin" -description = "Administrator account" -password = "\$6\$GRmb7S0p8vsYmXzH\$o0E020S.9JQGaHkszoog4ha4AQVs3sk8q0DvLjSMxoxHBKnB2FBXGQ/OkwZQfW/76ktHd0NX5nls2LPxPuUdl." -home = "/home/admin/" -groups = ["wheel"] EOF # No RT kernel in Fedora