From 793c96842a415e6fba8086d9fd84ba54285577de Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Thu, 15 Jan 2026 12:00:00 +0100
Subject: [PATCH] use sysuser setting for uuidd

Resolves: RHEL-132704
---
 util-linux-uuidd-sysusers.conf |  1 +
 util-linux.spec                | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 util-linux-uuidd-sysusers.conf

diff --git a/util-linux-uuidd-sysusers.conf b/util-linux-uuidd-sysusers.conf
new file mode 100644
index 0000000..afd02eb
--- /dev/null
+++ b/util-linux-uuidd-sysusers.conf
@@ -0,0 +1 @@
+u uuidd - "UUID generator helper daemon" /var/lib/libuuid
diff --git a/util-linux.spec b/util-linux.spec
index 58a036c..4d49de0 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -29,6 +29,7 @@ BuildRequires: popt-devel
 BuildRequires: libutempter-devel
 BuildRequires: systemd-devel
 BuildRequires: systemd
+BuildRequires: systemd-rpm-macros
 BuildRequires: libcap-ng-devel
 BuildRequires: %{pypkg}-devel
 BuildRequires: gcc
@@ -37,6 +38,7 @@ BuildRequires: po4a
 %ifarch ppc64le
 BuildRequires: librtas-devel
 %endif
+%{?sysusers_requires_compat}
 
 # enable if make changes to build-system
 BuildRequires: autoconf
@@ -55,6 +57,7 @@ Source12: util-linux-su.pamd
 Source13: util-linux-su-l.pamd
 Source14: util-linux-runuser.pamd
 Source15: util-linux-runuser-l.pamd
+Source16: util-linux-uuidd-sysusers.conf
 
 ### Obsoletes & Conflicts & Provides
 Conflicts: initscripts < 9.79-4
@@ -394,6 +397,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/{pam.d,security/console.apps}
 install -d %{buildroot}/run/uuidd
 install -d %{buildroot}/var/lib/libuuid
 
+install -m 644 -D %{SOURCE16} %{buildroot}%{_sysusersdir}/uuidd-sysusers.conf
+
 # /etc/adjtime
 install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/adjtime
 
@@ -490,11 +495,8 @@ find  %{buildroot}%{_mandir}/man8 -regextype posix-egrep  \
 %systemd_postun fstrim.service
 
 %pre -n uuidd
-getent group uuidd >/dev/null || groupadd -r uuidd
-getent passwd uuidd >/dev/null || \
-useradd -r -g uuidd -d /var/lib/libuuid -s /sbin/nologin \
-    -c "UUID generator helper daemon" uuidd
-exit 0
+%sysusers_create_compat %{SOURCE16}
+
 
 # Please, keep uuidd running after installation! Note that systemd_post is
 # "systemctl preset" and it enable/disable service only.
@@ -922,6 +924,7 @@ fi
 %dir %attr(2775, uuidd, uuidd) /run/uuidd
 %{compldir}/uuidd
 %{_tmpfilesdir}/uuidd-tmpfiles.conf
+%{_sysusersdir}/uuidd-sysusers.conf
 
 
 %files -n libfdisk