- added ghost for hwdb.bin generated by 'udevadm hwdb --update'

[packages/systemd.git] / systemd.spec

diff --git a/systemd.spec b/systemd.spec
index 9294bb64257741d8ddc2a32be99b9f754bdeaa19..ec99d88a95943739067926b8361aafe075c6c3df 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -15,13 +15,13 @@ Summary:    A System and Service Manager
 Summary(pl.UTF-8):     systemd - zarządca systemu i usług dla Linuksa
 Name:          systemd
 # Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
-Version:       207
-Release:       2
+Version:       208
+Release:       3
 Epoch:         1
 License:       GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:         Base
 Source0:       http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
-# Source0-md5: 7799f3cc9d289b8db1c1fa56ae7ecd88
+# Source0-md5: df64550d92afbffb4f67a434193ee165
 Source1:       %{name}-sysv-convert
 Source2:       %{name}_booted.c
 Source3:       network.service
@@ -101,6 +101,7 @@ Requires:   %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      %{name}-units = %{epoch}:%{version}-%{release}
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
+Requires(post):        /bin/setfacl
 Requires(pre): /bin/id
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
@@ -673,6 +674,8 @@ install -p %{SOURCE111} $RPM_BUILD_ROOT%{_sbindir}/start_udev
 cp -a %{SOURCE120} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/udev_blacklist.conf
 cp -a %{SOURCE121} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/fbdev-blacklist.conf
 
+:>$RPM_BUILD_ROOT%{_sysconfdir}/udev/hwdb.bin
+
 mv $RPM_BUILD_ROOT%{_mandir}/man8/{systemd-,}udevd.8
 echo ".so man8/udevd.8" >$RPM_BUILD_ROOT%{_mandir}/man8/systemd-udevd.8
 
@@ -780,26 +783,33 @@ rm -rf $RPM_BUILD_ROOT
 %groupadd -g 288 systemd-journal
 
 %post
-# should we?
-#setfacl -nm g:logs:rx,d:g:logs:rx /var/log/journal
-/bin/systemd-machine-id-setup > /dev/null 2>&1 || :
-/bin/systemctl daemon-reexec > /dev/null 2>&1 || :
+/bin/systemd-machine-id-setup || :
+/usr/lib/systemd/systemd-random-seed save || :
+/bin/systemctl --system daemon-reexec || :
+/bin/journalctl --update-catalog || :
+# Apply ACL to the journal directory
+/bin/setfacl -Rnm g:logs:rx,d:g:logs:rx /var/log/journal || :
 
 %postun
 if [ $1 -ge 1 ]; then
-       /bin/systemctl try-restart systemd-logind.service >/dev/null 2>&1 || :
+       /bin/systemctl --system daemon-reload || :
+       /bin/systemctl try-restart systemd-logind.service || :
 fi
 if [ "$1" = "0" ]; then
        %groupremove systemd-journal
 fi
 
+%triggerpostun -- systemd < 208-1
+chgrp -R systemd-journal /var/log/journal
+chmod g+s /var/log/journal
+
 %post   libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
 %post units
 if [ $1 -eq 1 ]; then
        # Try to read default runlevel from the old inittab if it exists
-       runlevel=$(/bin/awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab 2> /dev/null)
+       runlevel=$(/bin/awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab 2>/dev/null)
        if [ -z "$runlevel" ] ; then
                target="%{systemdunitdir}/graphical.target"
        else
@@ -807,7 +817,7 @@ if [ $1 -eq 1 ]; then
        fi
 
        # And symlink what we found to the new-style default.target
-       ln -s "$target" %{_sysconfdir}/systemd/system/default.target >/dev/null 2>&1 || :
+       ln -s "$target" %{_sysconfdir}/systemd/system/default.target || :
 
        # Setup hostname
        [ -f /etc/sysconfig/network ] && . /etc/sysconfig/network
@@ -824,7 +834,7 @@ if [ $1 -eq 1 ]; then
                remote-fs.target \
                systemd-readahead-replay.service \
                systemd-readahead-collect.service \
-               systemd-udev-settle.service >/dev/null 2>&1 || :
+               systemd-udev-settle.service || :
 fi
 
 %preun units
@@ -835,26 +845,26 @@ if [ $1 -eq 0 ] ; then
                remote-fs.target \
                systemd-readahead-replay.service \
                systemd-readahead-collect.service \
-               systemd-udev-settle.service >/dev/null 2>&1 || :
+               systemd-udev-settle.service || :
 
-       %{__rm} -f %{_sysconfdir}/systemd/system/default.target >/dev/null 2>&1 || :
+       %{__rm} -f %{_sysconfdir}/systemd/system/default.target || :
 fi
 
 %postun units
 if [ $1 -ge 1 ]; then
-       /bin/systemctl daemon-reload > /dev/null 2>&1 || :
+       /bin/systemctl daemon-reload || :
 fi
 
 %triggerpostun units -- systemd-units < 43-7
 # Remove design fialures
-%{__rm} -f %{_sysconfdir}/systemd/system/network.target.wants/ifcfg@*.service >/dev/null 2>&1 || :
-%{__rm} -f %{_sysconfdir}/systemd/system/network.target.wants/network-post.service >/dev/null 2>&1 || :
-%{__rm} -f %{_sysconfdir}/systemd/system/multi-user.target.wants/network-post.service >/dev/null 2>&1 || :
-/bin/systemctl reenable network.service >/dev/null 2>&1 || :
+%{__rm} -f %{_sysconfdir}/systemd/system/network.target.wants/ifcfg@*.service || :
+%{__rm} -f %{_sysconfdir}/systemd/system/network.target.wants/network-post.service || :
+%{__rm} -f %{_sysconfdir}/systemd/system/multi-user.target.wants/network-post.service || :
+/bin/systemctl reenable network.service || :
 
 %triggerpostun units -- systemd-units < 1:183
-/bin/systemctl --quiet enable systemd-udev-settle.service >/dev/null 2>&1 || :
-%{__rm} -f /etc/systemd/system/basic.target.wants/udev-settle.service >/dev/null 2>&1 || :
+/bin/systemctl --quiet enable systemd-udev-settle.service || :
+%{__rm} -f /etc/systemd/system/basic.target.wants/udev-settle.service || :
 # preserve renamed configs
 if [ -f /etc/systemd/systemd-journald.conf.rpmsave ]; then
        %{__mv} /etc/systemd/journald.conf{,.rpmnew}
@@ -918,6 +928,7 @@ fi
 /sbin/udevadm info --convert-db
 
 %post -n udev-core
+/sbin/udevadm hwdb --update || :
 if [ $1 -gt 1 ]; then
        if [ ! -x /bin/systemd_booted ] || ! /bin/systemd_booted; then
                if grep -qs devtmpfs /proc/mounts && [ -n "$(pidof udevd)" ]; then
@@ -1146,7 +1157,7 @@ fi
 %dir /var/lib/%{name}/coredump
 %attr(640,root,root) %ghost /var/log/btmp
 %attr(664,root,utmp) %ghost /var/log/wtmp
-%dir /var/log/journal
+%attr(2755,root,systemd-journal) %dir /var/log/journal
 
 %if %{with pam}
 %attr(755,root,root) /%{_lib}/security/pam_systemd.so
@@ -1422,6 +1433,7 @@ fi
 %dir %{_sysconfdir}/udev
 %dir %{_sysconfdir}/udev/rules.d
 %dir %{_sysconfdir}/udev/hwdb.d
+%ghost %{_sysconfdir}/udev/hwdb.bin
 
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/modprobe.d/fbdev-blacklist.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/modprobe.d/udev_blacklist.conf