From a647bde76c63ab5cd8d215c34312bd1c92ea3f7f Mon Sep 17 00:00:00 2001
From: Link Dupont <link@sub-pop.net>
Date: Tue, 24 Sep 2024 09:56:06 -0400
Subject: [PATCH] Use sysusers_create_compat to create users in pre

Resolves: RHEL-59966
---
 yggdrasil.spec    | 6 ++++++
 yggdrasil.sysuser | 4 ++++
 2 files changed, 10 insertions(+)
 create mode 100644 yggdrasil.sysuser

diff --git a/yggdrasil.spec b/yggdrasil.spec
index cf573a0..4b9e100 100644
--- a/yggdrasil.spec
+++ b/yggdrasil.spec
@@ -23,12 +23,14 @@ License:        GPL-3.0-only
 URL:            %{gourl}
 Source:         %{url}/releases/download/%{tag}/yggdrasil-%{version}.tar.xz
 Source1:        config.toml
+Source2:        yggdrasil.sysuser
 
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  meson
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(bash-completion)
+%{?sysusers_requires_compat}
 
 %description %{common_description}
 
@@ -62,12 +64,16 @@ export %gomodulesmode
 %install
 %meson_install
 %__install -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/config.toml
+%__install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysusersdir}/%{name}.conf
 
 %if %{with check}
 %check
 %gocheck
 %endif
 
+%pre
+%sysusers_create_compat %{SOURCE2}
+
 %post
 %systemd_post %{name}.service
 %systemd_user_post %{name}.service
diff --git a/yggdrasil.sysuser b/yggdrasil.sysuser
new file mode 100644
index 0000000..8e6679a
--- /dev/null
+++ b/yggdrasil.sysuser
@@ -0,0 +1,4 @@
+#Type Name               ID   GECOS                   Home directory    Shell
+u     yggdrasil          -    "yggdrasil system user" /var/lib/yggdrasil -
+u     yggdrasil-worker   -    "yggdrasil worker user" -                  -
+m     yggdrasil          yggdrasil-worker