From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] setup: Use systemd sysusers mechanism to create users/groups
Date: Wed, 29 Mar 2023 17:06:31 +0200
Message-ID: <20230329150631.2890261-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4455830983869019206=="
List-Id: <development.lists.ipfire.org>

--===============4455830983869019206==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

The sysusers files will be generated by the corresponding script file,
based on the passwd and group file in the source directory.

So we easily can edit the files stored in git and the changes will be
taken.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 dbus/dbus.sysusers                   |  7 +++++++
 setup/generate-sysusers-fragments.sh | 31 ++++++++++++++++++++++++++++
 setup/setup.nm                       |  7 ++++++-
 3 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 dbus/dbus.sysusers
 create mode 100755 setup/generate-sysusers-fragments.sh

diff --git a/dbus/dbus.sysusers b/dbus/dbus.sysusers
new file mode 100644
index 000000000..2ed994442
--- /dev/null
+++ b/dbus/dbus.sysusers
@@ -0,0 +1,7 @@
+#Type Name ID REMARK Home directory Shell
+
+# Dbus group
+g dbus 61
+
+# Dbus user
+u dbus 61 "User for dbus service" / /usr/sbin/nologin	=20
diff --git a/setup/generate-sysusers-fragments.sh b/setup/generate-sysusers-f=
ragments.sh
new file mode 100755
index 000000000..194c7204b
--- /dev/null
+++ b/setup/generate-sysusers-fragments.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+#SPDX-License-Identifier: 0BSD
+
+set -euo pipefail
+
+test -f group
+test -f passwd
+
+mkdir -p sysusers.d
+
+while read -r line; do
+  groupname=3D$(echo "${line}" | cut -d: -f1)
+  gid=3D$(echo "${line}" | cut -d: -f3)
+  echo "g ${groupname} ${gid}"
+done <group >sysusers.d/20-setup-groups.conf
+
+while read -r line; do
+  username=3D$(echo "${line}" | cut -d: -f1)
+  uid=3D$(echo "${line}" | cut -d: -f3)
+  gid=3D$(echo "${line}" | cut -d: -f4)
+  gecos=3D$(echo "${line}" | cut -d: -f5)
+  homedir=3D$(echo "${line}" | cut -d: -f6)
+  if [ "${homedir}" =3D=3D "/" ]; then
+    homedir=3D"-"
+  fi
+  shell=3D$(echo "${line}" | cut -d: -f7)
+  if [ "${shell}" =3D=3D "/usr/sbin/nologin" ]; then
+    shell=3D"-"
+  fi
+  echo "u ${username} ${uid}:${gid} \"${gecos}\" ${homedir} ${shell}"
+done <passwd >sysusers.d/20-setup-users.conf
diff --git a/setup/setup.nm b/setup/setup.nm
index cee66fab4..d4fd041ec 100644
--- a/setup/setup.nm
+++ b/setup/setup.nm
@@ -5,7 +5,7 @@
=20
 name       =3D setup
 version    =3D 3.0
-release    =3D 18
+release    =3D 19
 arch       =3D noarch
=20
 groups     =3D Base Build System/Base
@@ -29,6 +29,7 @@ build
 	end
=20
 	build
+		bash ./generate-sysusers-fragments.sh
 		bash ./shadowconvert.sh
 	end
=20
@@ -69,6 +70,10 @@ build
 		echo "d /run/motd.d 0755 root root -" >> %{BUILDROOT}%{tmpfilesdir}/%{name=
}.conf
 		chmod 0644 %{BUILDROOT}%{tmpfilesdir}/%{name}.conf
=20
+		# Install generated sysusers files.
+		mkdir -pv %{BUILDROOT}%{sysusersdir}
+		install -v -m 0644 %{DIR_APP}/sysusers.d/*.conf %{BUILDROOT}%{sysusersdir}
+
 		mkdir -pv %{BUILDROOT}%{sysconfdir}/sysctl.d
 		install -m 644 %{DIR_APP}/sysctl/printk.conf \
 			%{BUILDROOT}%{sysconfdir}/sysctl.d/printk.conf
--=20
2.30.2


--===============4455830983869019206==--