packages: systemd/compat-pld-var-run.tmpfiles, systemd/systemd.spec - rel 1...

baggins baggins at pld-linux.org
Sun Jan 29 20:37:00 CET 2012


Author: baggins                      Date: Sun Jan 29 19:37:00 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 13
- revert /var/run, it causes systemd to fail at startup

---- Files affected:
packages/systemd:
   compat-pld-var-run.tmpfiles (1.1 -> 1.2) , systemd.spec (1.97 -> 1.98) 

---- Diffs:

================================================================
Index: packages/systemd/compat-pld-var-run.tmpfiles
diff -u packages/systemd/compat-pld-var-run.tmpfiles:1.1 packages/systemd/compat-pld-var-run.tmpfiles:1.2
--- packages/systemd/compat-pld-var-run.tmpfiles:1.1	Sun Jan 29 18:03:48 2012
+++ packages/systemd/compat-pld-var-run.tmpfiles	Sun Jan 29 20:36:54 2012
@@ -86,7 +86,7 @@
 d /var/run/pam_mount 755 root root -
 d /var/run/pcscd 755 root root -
 d /var/run/pgpool 775 root pgpool -
-d /var/run/php 731 root http) %verify(not group mode -
+d /var/run/php 731 root http -
 d /var/run/pluto 755 root root -
 d /var/run/policyd 775 root policyd -
 d /var/run/PolicyKit 770 root polkituser -

================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.97 packages/systemd/systemd.spec:1.98
--- packages/systemd/systemd.spec:1.97	Sun Jan 29 18:03:48 2012
+++ packages/systemd/systemd.spec	Sun Jan 29 20:36:54 2012
@@ -12,7 +12,7 @@
 Summary(pl.UTF-8):	systemd - zarządca systemu i usług dla Linuksa
 Name:		systemd
 Version:	38
-Release:	12
+Release:	13
 License:	GPL v2+
 Group:		Base
 Source0:	http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
@@ -250,12 +250,15 @@
 
 # install compatibility tmpfiles configs
 install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/compat-pld-media.conf
-install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/compat-pld-var-run.conf
+#install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/compat-pld-var-run.conf
 
 # All wants links are created at %post to make sure they are not owned
 # and hence overriden by rpm if the user deletes them (missingok?)
 %{__rm} -r $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/*.target.wants
 
+# do not cover /var/run until packages need rpm-provided-only subdirectories
+%{__rm} $RPM_BUILD_ROOT/lib/systemd/system/local-fs.target.wants/var-run.mount
+
 # it is in rc-scripts pkg
 %{__rm} $RPM_BUILD_ROOT/lib/systemd/system/rc-local.service
 
@@ -573,6 +576,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.98  2012/01/29 19:36:54  baggins
+- rel 13
+- revert /var/run, it causes systemd to fail at startup
+
 Revision 1.97  2012/01/29 17:03:48  baggins
 - rel 12
 - add intermediate/compat tmpfiles configs for /media and /var/run
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/compat-pld-var-run.tmpfiles?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/systemd.spec?r1=1.97&r2=1.98&f=u



More information about the pld-cvs-commit mailing list