Merge branch 'document-1523' into calamares

FIXES #1523

src/modules/users/users.conf

@@ -3,26 +3,42 @@
 #
 # Configuration for the one-user-system user module.
 #
-# Besides these settings, the user module also places the following
-# keys into the globalconfig area, based on user input in the view step.
+# Besides these settings, the users module also places the following
+# keys into the Global Storage area, based on user input in the view step.
 #
 # - hostname
 # - username
 # - password (obscured)
 # - autologinUser (if enabled, set to username)
 #
-# These globalconfig keys are set when the jobs for this module
-# are created.
+# These Global Storage keys are set when the configuration for this module
+# is read and when they are modified in the UI.
 ---
 # Used as default groups for the created user.
 # Adjust to your Distribution defaults.
+#
+# Each entry in the *defaultGroups* list is either:
+#   - a string, naming a group; this is a **non**-system group
+#     which does not need to exist in the target system; if it
+#     does not exist, it will be created.
+#   - an entry with subkeys *name*, *must_exist* and *system*;
+#     if the group *must_exist* and does not, an error is thrown
+#     and the installation fails.
+#
+#     The group is created if it does not exist, and it is
+#     created as a system group (GID < 1000) or user group
+#     (GID >= 1000) depending on the value of *system*.
 defaultGroups:
-    - users
+    - name: users
+      must_exist: true
+      system: true
     - lp
     - video
     - network
     - storage
-    - wheel
+    - name: wheel
+      must_exist: false
+      system: true
     - audio
 
 # Some Distributions require a 'autologin' group for the user.

src/modules/users/users.schema.yaml

@@ -11,7 +11,16 @@ properties:
     # Group settings
     defaultGroups:
         type: array
-        items: { type: string }
+        items:
+            oneOf:
+                - type: string
+                - type: object
+                  properties:
+                      name: { type: string }
+                      must_exist: { type: boolean, default: false }
+                      system: { type: boolean, default: false }
+                  additionalProperties: false
+                  required: [ name ]
     autologinGroup: { type: string }
     sudoersGroup: { type: string }
     # Skip login (depends on displaymanager support)