From c77170a924a0fffe808c8118be3aee716cd5a630 Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Wed, 14 Jul 2021 17:26:14 +0000
Subject: [PATCH] test/data: create core user via kickstart

Create the users via the new users support that was added to the
kickstart stage, instead of having them in the OSTree commit.
---
 .../data/manifests/fedora-ostree-bootiso.json | 24 ++++++++-----------
 .../manifests/fedora-ostree-bootiso.mpp.json  | 24 ++++++++-----------
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/test/data/manifests/fedora-ostree-bootiso.json b/test/data/manifests/fedora-ostree-bootiso.json
index f3b68415..0d28d29a 100644
--- a/test/data/manifests/fedora-ostree-bootiso.json
+++ b/test/data/manifests/fedora-ostree-bootiso.json
@@ -790,19 +790,6 @@
             ]
           }
         },
-        {
-          "type": "org.osbuild.users",
-          "options": {
-            "users": {
-              "root": {
-                "password": ""
-              },
-              "core": {
-                "password": ""
-              }
-            }
-          }
-        },
         {
           "type": "org.osbuild.ostree.preptree",
           "options": {
@@ -1722,7 +1709,8 @@
             "kickstart-modules": [
               "org.fedoraproject.Anaconda.Modules.Network",
               "org.fedoraproject.Anaconda.Modules.Payloads",
-              "org.fedoraproject.Anaconda.Modules.Storage"
+              "org.fedoraproject.Anaconda.Modules.Storage",
+              "org.fedoraproject.Anaconda.Modules.Users"
             ]
           }
         },
@@ -1742,6 +1730,14 @@
               "url": "file:///ostree/repo",
               "ref": "fedora/x86_64/osbuild",
               "gpg": false
+            },
+            "users": {
+              "core": {
+                "password": "edge",
+                "groups": [
+                  "wheel"
+                ]
+              }
             }
           }
         }
diff --git a/test/data/manifests/fedora-ostree-bootiso.mpp.json b/test/data/manifests/fedora-ostree-bootiso.mpp.json
index 0a095b39..cf83960e 100644
--- a/test/data/manifests/fedora-ostree-bootiso.mpp.json
+++ b/test/data/manifests/fedora-ostree-bootiso.mpp.json
@@ -171,19 +171,6 @@
             ]
           }
         },
-        {
-          "type": "org.osbuild.users",
-          "options": {
-            "users": {
-              "root": {
-                "password": ""
-              },
-              "core": {
-                "password": ""
-              }
-            }
-          }
-        },
         {
           "type": "org.osbuild.ostree.preptree",
           "options": {
@@ -493,7 +480,8 @@
             "kickstart-modules": [
               "org.fedoraproject.Anaconda.Modules.Network",
               "org.fedoraproject.Anaconda.Modules.Payloads",
-              "org.fedoraproject.Anaconda.Modules.Storage"
+              "org.fedoraproject.Anaconda.Modules.Storage",
+              "org.fedoraproject.Anaconda.Modules.Users"
             ]
           }
         },
@@ -517,6 +505,14 @@
                 "mpp-format-string": "{ref}"
               },
               "gpg": false
+            },
+            "users": {
+              "core": {
+                "password": "edge",
+                "groups": [
+                  "wheel"
+                ]
+              }
             }
           }
         }