packages: systemd/systemd.spec - removed /media and /var/run--bind tmpfs mo...

[gotar]

Author: gotar                        Date: Mon Nov 28 01:09:48 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- removed /media and /var/run--bind tmpfs mounts from local-fs target,
- packaged /run directory for tmpfs early-boot mount (this is due to
  possible lack of mounted /var at this stage, kept /var/lock--bind)

---- Files affected:
packages/systemd:
   systemd.spec (1.43 -> 1.44) 

---- Diffs:

================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.43 packages/systemd/systemd.spec:1.44
--- packages/systemd/systemd.spec:1.43	Mon Nov 28 01:59:04 2011
+++ packages/systemd/systemd.spec	Mon Nov 28 02:09:43 2011
@@ -181,7 +181,7 @@
 
 # Create SysV compatibility symlinks. systemctl/systemd are smart
 # enough to detect in which way they are called.
-install -d $RPM_BUILD_ROOT/sbin
+install -d $RPM_BUILD_ROOT/{run,sbin}
 ln -s ../bin/systemd $RPM_BUILD_ROOT/sbin/init
 ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/halt
 ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/poweroff
@@ -197,6 +197,11 @@
 # them.
 %{__rm} -r $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/*.target.wants
 
+# do not cover /media (system-specific removable mountpoints)
+%{__rm} $RPM_BUILD_ROOT/lib/systemd/local-fs.target.wants/media.mount
+# do not cover /var/run (packages need rpm-provided subdirectories)
+%{__rm} $RPM_BUILD_ROOT/lib/systemd/local-fs.target.wants/var-run.mount
+
 # Make sure these directories are properly owned
 install -d $RPM_BUILD_ROOT/lib/systemd/system/{basic,dbus,default,halt,kexec,poweroff,reboot,syslog}.target.wants
 
@@ -226,8 +231,8 @@
 	/bin/systemctl try-restart systemd-logind.service >/dev/null 2>&1 || :
 fi
 
-%post	libs -p /sbin/ldconfig
-%postun	libs -p /sbin/ldconfig
+%post   libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %post units
 if [ $1 -eq 1 ]; then
@@ -274,9 +279,9 @@
 /etc/dbus-1/system.d/org.freedesktop.login1.conf
 /etc/dbus-1/system.d/org.freedesktop.systemd1.conf
 /etc/dbus-1/system.d/org.freedesktop.timedate1.conf
+%ghost %config(noreplace) %{_sysconfdir}/machine-id
 %dir %{_sysconfdir}/systemd
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/*.conf
-%ghost %config(noreplace) %{_sysconfdir}/machine-id
 /etc/xdg/systemd
 %attr(755,root,root) /bin/systemd
 %attr(755,root,root) /bin/systemd-ask-password
@@ -296,9 +301,6 @@
 %attr(755,root,root) /sbin/shutdown
 %attr(755,root,root) /sbin/telinit
 %attr(755,root,root) /lib/systemd/systemd-*
-
-%dir %{_libexecdir}/systemd
-%{_libexecdir}/systemd/user
 %dir /lib/systemd/system-generators
 %attr(755,root,root) /lib/systemd/system-generators/systemd-*-generator
 %dir /lib/systemd/system-shutdown
@@ -306,6 +308,9 @@
 /lib/udev/rules.d/70-uaccess.rules
 /lib/udev/rules.d/71-seat.rules
 /lib/udev/rules.d/73-seat-late.rules
+%dir /run
+%dir %{_libexecdir}/systemd
+%{_libexecdir}/systemd/user
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_libexecdir}/tmpfiles.d/*.conf
 %{_datadir}/dbus-1/interfaces/org.freedesktop.hostname1.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.locale1.xml
@@ -435,6 +440,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2011/11/28 01:09:43  gotar
+- removed /media and /var/run--bind tmpfs mounts from local-fs target,
+- packaged /run directory for tmpfs early-boot mount (this is due to
+  possible lack of mounted /var at this stage, kept /var/lock--bind)
+
 Revision 1.43  2011/11/28 00:59:04  cactus
 - add libs subpackage - now it is possible to install systemd-devel without systemd
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/systemd.spec?r1=1.43&r2=1.44&f=u