SHA256
1
0
forked from pool/systemd
Dr. Werner Fink 2015-09-07 08:11:12 +00:00 committed by Git OBS Bridge
parent d99b02de97
commit cf8f3750f0
4 changed files with 46 additions and 4 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Sep 7 08:09:05 UTC 2015 - werner@suse.de
- Try to generate the systemd users and groups always in same order
to avoid republish other packages (boo#944660)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 21 07:49:33 UTC 2015 - fbui@suse.com Fri Aug 21 07:49:33 UTC 2015 - fbui@suse.com

View File

@ -900,7 +900,22 @@ cat /usr/share/systemd/kbd-model-map.xkb-generated \
%find_lang systemd %find_lang systemd
%pre %pre
getent group systemd-journal >/dev/null || groupadd -r systemd-journal || : for name in journal timesync network resolve bus-proxy
do
getent group systemd-$name >/dev/null && continue
groupadd -r systemd-$name || :
done
for name in timesync network resolve bus-proxy
do
getent passwd systemd-$name >/dev/null && continue
case "$name" in
timesync) descr="Systemd Time Synchronization" ;;
network) descr="Systemd Network Management" ;;
resolve) descr="Systemd Resolver" ;;
bus-proxy) descr="Systemd Bus Proxy" ;;
esac
useradd -r -l -g systemd-$name systemd-$name -s /usr/sbin/nologin -d / -c "$descr" || :
done
exit 0 exit 0
%post %post
@ -1101,7 +1116,7 @@ fi
%postun -n nss-mymachines -p /sbin/ldconfig %postun -n nss-mymachines -p /sbin/ldconfig
%pre journal-gateway %pre journal-gateway
getent passwd systemd-journal-gateway >/dev/null || useradd -r -l -g systemd-journal-gateway -d %{_localstatedir}/log/journal/ -s /usr/sbin/nologin -c "Journal Gateway" systemd-journal-gateway || : getent passwd systemd-journal-gateway >/dev/null || useradd -r -l -g systemd-journal-gateway -d %{_localstatedir}/log/journal/ -s /usr/sbin/nologin -c "Systemd Journal Gateway" systemd-journal-gateway || :
getent group systemd-journal-gateway >/dev/null || groupadd -r systemd-journal-gateway || : getent group systemd-journal-gateway >/dev/null || groupadd -r systemd-journal-gateway || :
%service_add_pre systemd-journal-gatewayd.socket systemd-journal-gatewayd.service %service_add_pre systemd-journal-gatewayd.socket systemd-journal-gatewayd.service
exit 0 exit 0

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Sep 7 08:09:05 UTC 2015 - werner@suse.de
- Try to generate the systemd users and groups always in same order
to avoid republish other packages (boo#944660)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 21 07:49:33 UTC 2015 - fbui@suse.com Fri Aug 21 07:49:33 UTC 2015 - fbui@suse.com

View File

@ -895,7 +895,22 @@ cat /usr/share/systemd/kbd-model-map.xkb-generated \
%find_lang systemd %find_lang systemd
%pre %pre
getent group systemd-journal >/dev/null || groupadd -r systemd-journal || : for name in journal timesync network resolve bus-proxy
do
getent group systemd-$name >/dev/null && continue
groupadd -r systemd-$name || :
done
for name in timesync network resolve bus-proxy
do
getent passwd systemd-$name >/dev/null && continue
case "$name" in
timesync) descr="Systemd Time Synchronization" ;;
network) descr="Systemd Network Management" ;;
resolve) descr="Systemd Resolver" ;;
bus-proxy) descr="Systemd Bus Proxy" ;;
esac
useradd -r -l -g systemd-$name systemd-$name -s /usr/sbin/nologin -d / -c "$descr" || :
done
exit 0 exit 0
%post %post
@ -1096,7 +1111,7 @@ fi
%postun -n nss-mymachines -p /sbin/ldconfig %postun -n nss-mymachines -p /sbin/ldconfig
%pre journal-gateway %pre journal-gateway
getent passwd systemd-journal-gateway >/dev/null || useradd -r -l -g systemd-journal-gateway -d %{_localstatedir}/log/journal/ -s /usr/sbin/nologin -c "Journal Gateway" systemd-journal-gateway || : getent passwd systemd-journal-gateway >/dev/null || useradd -r -l -g systemd-journal-gateway -d %{_localstatedir}/log/journal/ -s /usr/sbin/nologin -c "Systemd Journal Gateway" systemd-journal-gateway || :
getent group systemd-journal-gateway >/dev/null || groupadd -r systemd-journal-gateway || : getent group systemd-journal-gateway >/dev/null || groupadd -r systemd-journal-gateway || :
%service_add_pre systemd-journal-gatewayd.socket systemd-journal-gatewayd.service %service_add_pre systemd-journal-gatewayd.socket systemd-journal-gatewayd.service
exit 0 exit 0