packages: systemd/shut-sysv-up.patch, systemd/systemd.spec - 0.39 - make tm...

[baggins]

Author: baggins                      Date: Sun Jan 29 22:36:18 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 0.39
- make tmpfiles problems not fatal, allowing system boot with incorrect tmpfiles configs
- tmpfiles error being not fatal allows enabling tmpfs for /var/run
- shut-sysv-up.patch needs attention (API changed)

---- Files affected:
packages/systemd:
   shut-sysv-up.patch (1.2 -> 1.3) , systemd.spec (1.98 -> 1.99) 

---- Diffs:

================================================================
Index: packages/systemd/shut-sysv-up.patch
diff -u packages/systemd/shut-sysv-up.patch:1.2 packages/systemd/shut-sysv-up.patch:1.3
--- packages/systemd/shut-sysv-up.patch:1.2	Tue Dec  6 21:29:30 2011
+++ packages/systemd/shut-sysv-up.patch	Sun Jan 29 23:36:13 2012
@@ -6,7 +6,7 @@
          assert(format);
  
 -        if (!UNIT_VTABLE(u)->show_status)
-+        if (!UNIT_VTABLE(u)->show_status || (u->meta.manager->sysv_console && u->service.sysv_path && (u->meta.job==NULL || u->meta.job->result==JOB_DONE) && UNIT_VTABLE(u)->active_state(u)!=UNIT_FAILED && LOG_PRI(log_get_max_level()) <= LOG_INFO))
++        if (!UNIT_VTABLE(u)->show_status || (u->manager->sysv_console && u->service.sysv_path && (u->job==NULL || u->job->result==JOB_DONE) && UNIT_VTABLE(u)->active_state(u)!=UNIT_FAILED && LOG_PRI(log_get_max_level()) <= LOG_INFO))
                  return;
  
-         if (!manager_get_show_status(u->meta.manager))
+         if (!manager_get_show_status(u->manager))

================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.98 packages/systemd/systemd.spec:1.99
--- packages/systemd/systemd.spec:1.98	Sun Jan 29 20:36:54 2012
+++ packages/systemd/systemd.spec	Sun Jan 29 23:36:13 2012
@@ -1,5 +1,10 @@
 # $Revision$, $Date$
 #
+# TODO:
+#	- remove compat-pld-var-run.tmpfiles and maybe tmpfiles-not-fatal.patch
+#	  after enough packages provide their own tmpfiles.d configs for
+#	  /var/run directories
+#
 # Conditional build:
 %bcond_without	audit		# without audit support
 %bcond_without	cryptsetup	# without cryptsetup support
@@ -11,12 +16,12 @@
 Summary:	A System and Service Manager
 Summary(pl.UTF-8):	systemd - zarządca systemu i usług dla Linuksa
 Name:		systemd
-Version:	38
-Release:	13
+Version:	39
+Release:	0.1
 License:	GPL v2+
 Group:		Base
 Source0:	http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
-# Source0-md5:	68c66dce5a28c0efd7c210af5d11efed
+# Source0-md5:	7179b34f6f6553d2a36551ac1dec5f0d
 Source1:	%{name}-sysv-convert
 Source2:	systemd_booted.c
 Source3:	ifup at .service
@@ -28,6 +33,7 @@
 Patch1:		config-pld.patch
 Patch2:		shut-sysv-up.patch
 Patch3:		pld-sysv-network.patch
+Patch4:		tmpfiles-not-fatal.patch
 URL:		http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires:	acl-devel
 %{?with_audit:BuildRequires:	audit-libs-devel}
@@ -194,8 +200,9 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 %patch3 -p1
+%patch4 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
 %build
@@ -250,15 +257,12 @@
 
 # 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
 
@@ -397,6 +401,8 @@
 %attr(755,root,root) /bin/systemd-notify
 %attr(755,root,root) /bin/systemd-tty-ask-password-agent
 %attr(755,root,root) %{_bindir}/systemd-analyze
+%attr(755,root,root) %{_bindir}/systemd-cat
+%attr(755,root,root) %{_bindir}/systemd-cgtop
 %attr(755,root,root) %{_bindir}/systemd-cgls
 %attr(755,root,root) %{_bindir}/systemd-nspawn
 %attr(755,root,root) %{_bindir}/systemd-stdio-bridge
@@ -496,6 +502,7 @@
 %dir %{_libexecdir}/binfmt.d
 %dir %{_libexecdir}/modules-load.d
 %dir %{_libexecdir}/sysctl.d
+%{_libexecdir}/sysctl.d/coredump.conf
 %attr(755,root,root) /bin/systemctl
 %attr(755,root,root) /bin/systemd-tmpfiles
 %attr(755,root,root) /bin/systemd_booted
@@ -576,6 +583,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.99  2012/01/29 22:36:13  baggins
+- 0.39
+- make tmpfiles problems not fatal, allowing system boot with incorrect tmpfiles configs
+- tmpfiles error being not fatal allows enabling tmpfs for /var/run
+- shut-sysv-up.patch needs attention (API changed)
+
 Revision 1.98  2012/01/29 19:36:54  baggins
 - rel 13
 - revert /var/run, it causes systemd to fail at startup
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/shut-sysv-up.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/systemd.spec?r1=1.98&r2=1.99&f=u