packages: systemd/systemd.spec - install network proxies to rc-scripts - al...

[baggins]

Author: baggins                      Date: Fri Jan 20 22:54:38 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- install network proxies to rc-scripts
- always enable default units in post
- always find and enable itnterfaces in post

---- Files affected:
packages/systemd:
   systemd.spec (1.78 -> 1.79) 

---- Diffs:

================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.78 packages/systemd/systemd.spec:1.79
--- packages/systemd/systemd.spec:1.78	Tue Jan 17 22:30:12 2012
+++ packages/systemd/systemd.spec	Fri Jan 20 23:54:33 2012
@@ -12,13 +12,16 @@
 Summary(pl.UTF-8):	systemd - zarządca systemu i usług dla Linuksa
 Name:		systemd
 Version:	38
-Release:	3
+Release:	3.1
 License:	GPL v2+
 Group:		Base
 Source0:	http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
 # Source0-md5:	68c66dce5a28c0efd7c210af5d11efed
 Source1:	%{name}-sysv-convert
 Source2:	systemd_booted.c
+Source3:	ifup at .service
+Source4:	network-post.service
+Source5:	network.service
 Patch0:		target-pld.patch
 Patch1:		config-pld.patch
 Patch2:		shut-sysv-up.patch
@@ -234,6 +237,11 @@
 ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/random.service
 ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/console.service
 
+# add static (non-NetworkManager) networking
+install %{SOURCE3} $RPM_BUILD_ROOT/lib/systemd/system/ifup at .service
+install %{SOURCE4} $RPM_BUILD_ROOT/lib/systemd/system/network-post.service
+install %{SOURCE5} $RPM_BUILD_ROOT/lib/systemd/system/network.service
+
 # 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
@@ -298,24 +306,43 @@
 
 	# And symlink what we found to the new-style default.target
 	ln -s "$target" %{_sysconfdir}/systemd/system/default.target >/dev/null 2>&1 || :
-
-	# Enable the services we install by default.
-	/bin/systemctl enable \
-		getty at .service \
-		remote-fs.target \
-		systemd-readahead-replay.service \
-		systemd-readahead-collect.service >/dev/null 2>&1 || :
 fi
+# Enable the services we install by default.
+/bin/systemctl enable \
+	getty at .service \
+	network.service \
+	network-post.service \
+	remote-fs.target \
+	systemd-readahead-replay.service \
+	systemd-readahead-collect.service >/dev/null 2>&1 || :
+
+# Find and enable all installed interfaces
+for f in /etc/sysconfig/interfaces/ifcfg-* ; do
+	ff=$(basename $f)
+	ff=${ff##ifcfg-}
+	case "$ff" in
+	*.rpmorig|*.rpmnew|*.rpmsave|*~|*.orig)
+		continue
+		;;
+	*)
+		ln -s /lib/systemd/system/ifup at .service \
+			%{_sysconfdir}/systemd/system/network.target.wants/ifcfg@$ff.service >/dev/null 2>&1 || :
+		;;
+	esac
+done
 
 %preun units
 if [ $1 -eq 0 ] ; then
 	/bin/systemctl disable \
 		getty at .service \
+		network.service \
+		network-post.service \
 		remote-fs.target \
 		systemd-readahead-replay.service \
 		systemd-readahead-collect.service >/dev/null 2>&1 || :
 
 	%{__rm} -f %{_sysconfdir}/systemd/system/default.target >/dev/null 2>&1 || :
+	%{__rm} -f %{_sysconfdir}/systemd/system/network.target.wants/ifcfg@*.service >/dev/null 2>&1 || :
 fi
 
 %postun units
@@ -527,6 +554,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.79  2012/01/20 22:54:33  baggins
+- install network proxies to rc-scripts
+- always enable default units in post
+- always find and enable itnterfaces in post
+
 Revision 1.78  2012/01/17 21:30:12  megabajt
 - use /lib64 for libraries on x86_64
 - release 3
================================================================

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