packages: systemd/systemd.spec, systemd/pld-sysv-network.patch (NEW) - add ...

[baggins]

Author: baggins                      Date: Thu Jan 26 18:21:09 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add ugly hack to detect PLD SysV service requiring network

---- Files affected:
packages/systemd:
   systemd.spec (1.88 -> 1.89) , pld-sysv-network.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.88 packages/systemd/systemd.spec:1.89
--- packages/systemd/systemd.spec:1.88	Tue Jan 24 14:51:54 2012
+++ packages/systemd/systemd.spec	Thu Jan 26 19:21:04 2012
@@ -12,7 +12,7 @@
 Summary(pl.UTF-8):	systemd - zarządca systemu i usług dla Linuksa
 Name:		systemd
 Version:	38
-Release:	9
+Release:	9.4
 License:	GPL v2+
 Group:		Base
 Source0:	http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
@@ -26,6 +26,7 @@
 Patch1:		config-pld.patch
 Patch2:		shut-sysv-up.patch
 Patch3:		virt-libvirt.patch
+Patch4:		pld-sysv-network.patch
 URL:		http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires:	acl-devel
 %{?with_audit:BuildRequires:	audit-libs-devel}
@@ -192,6 +193,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
 %build
@@ -328,9 +330,9 @@
 		continue
 		;;
 	*)
-		DEVICE=""
-		ONBOOT=""
+		DEVICE="" ; ONBOOT="" ; USERS=""
 		. $f 2>/dev/null
+		[ ${USERS:-no} != no ] && continue
 		if [ "$DEVICE" = "$ff" -a ${ONBOOT:-no} = "yes" ]; then
 			ln -s /lib/systemd/system/ifup at .service \
 				%{_sysconfdir}/systemd/system/network.target.wants/ifcfg@$ff.service >/dev/null 2>&1 || :
@@ -562,6 +564,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.89  2012/01/26 18:21:04  baggins
+- add ugly hack to detect PLD SysV service requiring network
+
 Revision 1.88  2012/01/24 13:51:54  baggins
 - rel 9
 - hide source (.) errors

================================================================
Index: packages/systemd/pld-sysv-network.patch
diff -u /dev/null packages/systemd/pld-sysv-network.patch:1.1
--- /dev/null	Thu Jan 26 19:21:09 2012
+++ packages/systemd/pld-sysv-network.patch	Thu Jan 26 19:21:04 2012
@@ -0,0 +1,16 @@
+--- systemd-38/src/service.c~	2012-01-26 00:12:06.239561034 +0100
++++ systemd-38/src/service.c	2012-01-26 18:26:15.476825041 +0100
+@@ -516,6 +516,13 @@
+                 line++;
+ 
+                 t = strstrip(l);
++                # PLD specifick ugly hack to detect SysV services requiring networking
++                if (startswith_no_case(t, ". /etc/sysconfig/network")) {
++                        r = unit_add_dependency_by_name(UNIT(s), UNIT_REQUIRES | UNIT_AFTER, "network.target", NULL, true);
++
++                        if (r < 0)
++                                 log_error("[%s:%u] Failed to add dependency on network.target, ignoring: %s", path, line, strerror(-r));
++                }
+                 if (*t != '#')
+                         continue;
+ 
================================================================

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