From 3929e38ac0713b0121cef3d5b498dc9df493bc31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <travier@redhat.com>
Date: Wed, 10 Mar 2021 16:17:29 +0100
Subject: [PATCH] Remove rpm-ostree sysusers config

---
 Makefile-daemon.am           | 4 ----
 packaging/rpm-ostree.spec.in | 1 -
 src/daemon/rpm-ostree.conf   | 1 -
 3 files changed, 6 deletions(-)
 delete mode 100644 src/daemon/rpm-ostree.conf

diff --git a/Makefile-daemon.am b/Makefile-daemon.am
index ed8ff56d..6e6cb3a3 100644
--- a/Makefile-daemon.am
+++ b/Makefile-daemon.am
@@ -82,9 +82,6 @@ endif
 $(systemdunit_service_files): Makefile
 	$(SED_SUBST) $(daemon_asan_options) $@.in > $@
 
-systemdsysusers_DATA = $(srcdir)/src/daemon/rpm-ostree.conf
-systemdsysusersdir   = $(prefix)/lib/sysusers.d
-
 # We keep this stub script around to have SELinux labeling work,
 # plus some backwards compatibility.
 libexec_SCRIPTS = rpm-ostreed
@@ -114,7 +111,6 @@ EXTRA_DIST += \
 	$(service_in_files) \
 	$(systemdunit_service_in_files) \
 	$(systemdunit_timer_files) \
-	$(systemdsysusers_conf_files) \
 	$(NULL)
 
 CLEANFILES += \
diff --git a/packaging/rpm-ostree.spec.in b/packaging/rpm-ostree.spec.in
index 3605e84b..a9748434 100644
--- a/packaging/rpm-ostree.spec.in
+++ b/packaging/rpm-ostree.spec.in
@@ -175,7 +175,6 @@ $PYTHON autofiles.py > files \
   '%{_datadir}/dbus-1/system.d/*' \
   '%{_sysconfdir}/rpm-ostreed.conf' \
   '%{_prefix}/lib/systemd/system/*' \
-  '%{_prefix}/lib/sysusers.d*' \
   '%{_libexecdir}/rpm-ostree*' \
   '%{_datadir}/polkit-1/actions/*.policy' \
   '%{_datadir}/dbus-1/system-services' \
diff --git a/src/daemon/rpm-ostree.conf b/src/daemon/rpm-ostree.conf
deleted file mode 100644
index 7ebb02c2..00000000
--- a/src/daemon/rpm-ostree.conf
+++ /dev/null
@@ -1 +0,0 @@
-u rpm-ostree - "Unprivileged rpm-ostree user"