Blob Blame History Raw
From cccfc3e59c9858b30deebd899e873a0387ea7140 Mon Sep 17 00:00:00 2001
From: Robin Lee <cheeselee@fedoraproject.org>
Date: Tue, 10 Nov 2020 15:45:30 +0800
Subject: [PATCH 5/9] fix: include sysuser config file for Fedora

The sysuser config file was dropped in 214afea93

Log: include sysuser config file for Fedora
Signed-off-by: Robin Lee <cheeselee@fedoraproject.org>
---
 rpm/dde-daemon.spec        | 6 ++++++
 rpm/deepin-daemon.sysusers | 2 ++
 2 files changed, 8 insertions(+)
 create mode 100644 rpm/deepin-daemon.sysusers

diff --git a/rpm/dde-daemon.spec b/rpm/dde-daemon.spec
index e81ea7ed..6091f00f 100644
--- a/rpm/dde-daemon.spec
+++ b/rpm/dde-daemon.spec
@@ -28,6 +28,7 @@ Source0:        %{url}/archive/%{version}/%{repo}-%{version}.tar.gz
 # upstream default mono font set to 'Noto Mono', which is not yet available in
 # Fedora. We change to 'Noto Sans Mono'
 Source1:        fontconfig.json
+Source2:        %{sname}.sysusers
 %else
 URL:            http://shuttle.corp.deepin.com/cache/tasks/18802/unstable-amd64/
 Source0:        %{repo}-%{version}.orig.tar.xz
@@ -174,6 +175,10 @@ export GOPATH=/usr/share/gocode
 # don't install pam module
 rm %{buildroot}%{_libdir}/security/pam_deepin_auth.so %{buildroot}%{_datadir}/pam-configs/deepin-auth
 
+%if 0%{?fedora}
+install -Dm644 %{SOURCE2} %{buildroot}/usr/lib/sysusers.d/%{name}.conf
+%endif
+
 # fix systemd/logind config
 install -d %{buildroot}/usr/lib/systemd/logind.conf.d/
 cat > %{buildroot}/usr/lib/systemd/logind.conf.d/10-%{sname}.conf <<EOF
@@ -240,6 +245,7 @@ fi
 %{_unitdir}/deepin-accounts-daemon.service
 %{_unitdir}/hwclock_stop.service
 %if 0%{?fedora}
+%{_sysusersdir}/%{name}.conf
 %{_datadir}/deepin-default-settings/
 %endif
 
diff --git a/rpm/deepin-daemon.sysusers b/rpm/deepin-daemon.sysusers
new file mode 100644
index 00000000..a6760871
--- /dev/null
+++ b/rpm/deepin-daemon.sysusers
@@ -0,0 +1,2 @@
+u deepin-daemon - "Deepin Daemon"
+g deepin-daemon -
-- 
2.26.2