From a17c81df0caa29f189bcae6c5acb6a100e7ee967 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 6 Jan 2024 17:26:02 +0100
Subject: [PATCH] Move /etc/group generation to the installer

This ensures that the gid's for the auto-generated user groups stay in
sync with the gid in /etc/passwd. It also makes it easier to evolve the
format of /etc/group in the future.
---
 config/base.toml | 14 +++++---------
 installer        |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/config/base.toml b/config/base.toml
index 195300b..cd12efb 100644
--- a/config/base.toml
+++ b/config/base.toml
@@ -105,15 +105,6 @@ path = "/dev/stderr"
 data = "libc:stderr"
 symlink = true
 
-# Group settings
-[[files]]
-path = "/etc/group"
-data = """
-root;0;root
-user;1000;user
-sudo;1;user
-"""
-
 # User settings
 [users.root]
 password = "password"
@@ -125,3 +116,8 @@ home = "/root"
 [users.user]
 # Password is unset
 password = ""
+
+# Group settings
+[groups.sudo]
+gid = 1
+members = ["user"]
diff --git a/installer b/installer
index 6a4802d..7a7790e 160000
--- a/installer
+++ b/installer
@@ -1 +1 @@
-Subproject commit 6a4802d55631fee7a8de07b4f0f87ebd7f2f115b
+Subproject commit 7a7790e9bd2db0cf8ac07192ba3bba2e25673dbe