packages: rc-scripts/rc-scripts.spec, rc-scripts/rc-scripts-skip_networkman...

[cactus]

Author: cactus                       Date: Wed Jan 25 09:55:06 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; add skip_networkmanager_users_config.patch

---- Files affected:
packages/rc-scripts:
   rc-scripts.spec (1.381 -> 1.382) , rc-scripts-skip_networkmanager_users_config.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/rc-scripts/rc-scripts.spec
diff -u packages/rc-scripts/rc-scripts.spec:1.381 packages/rc-scripts/rc-scripts.spec:1.382
--- packages/rc-scripts/rc-scripts.spec:1.381	Fri Dec 16 09:48:11 2011
+++ packages/rc-scripts/rc-scripts.spec	Wed Jan 25 10:55:00 2012
@@ -10,7 +10,7 @@
 Summary(tr.UTF-8):	inittab ve /etc/rc.d dosyaları
 Name:		rc-scripts
 Version:	0.4.5.2
-Release:	3
+Release:	4
 License:	GPL v2
 Group:		Base
 #Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
@@ -20,6 +20,7 @@
 Source2:	rc-local.service
 URL:		http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
 Patch0:		%{name}-svn.patch
+Patch1:		%{name}-skip_networkmanager_users_config.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gettext-devel
@@ -119,6 +120,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1
 
 # hack, currently this results -lgcc_s not found error:
 #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic"
@@ -392,6 +394,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.382  2012/01/25 09:55:00  cactus
+- rel 4; add skip_networkmanager_users_config.patch
+
 Revision 1.381  2011/12/16 08:48:11  arekm
 - rel 3; lvm sysinit vs ignorelockingfailure fixes.
 

================================================================
Index: packages/rc-scripts/rc-scripts-skip_networkmanager_users_config.patch
diff -u /dev/null packages/rc-scripts/rc-scripts-skip_networkmanager_users_config.patch:1.1
--- /dev/null	Wed Jan 25 10:55:06 2012
+++ packages/rc-scripts/rc-scripts-skip_networkmanager_users_config.patch	Wed Jan 25 10:55:00 2012
@@ -0,0 +1,62 @@
+--- rc-scripts-0.4.5.2/rc.d/init.d/network.orig	2011-12-14 12:23:30.000000000 +0100
++++ rc-scripts-0.4.5.2/rc.d/init.d/network	2012-01-25 10:37:12.670299072 +0100
+@@ -135,7 +135,8 @@
+ 				case $i in
+ 					*ifcfg-lo) continue ;;
+ 				esac
+-				ONBOOT=""; . "$i" 2>/dev/null
++				ONBOOT=""; USERS=""; . "$i" 2>/dev/null
++				[ ${USERS:-no} != no ] && continue
+ 				[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
+ 			done
+ 		`
+@@ -145,7 +146,8 @@
+ 				case ${i##*/} in
+ 					ifcfg-lo|ifcfg-sit*|ifcfg-atm*|ifcfg-lec*|ifcfg-nas*|ifcfg-br*|ifcfg-*.*) continue ;;
+ 				esac
+-				ONBOOT=""; . "$i" 2>/dev/null
++				ONBOOT=""; USERS=""; . "$i" 2>/dev/null
++				[ ${USERS:-no} != no ] && continue
+ 				[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
+ 			done
+ 		`
+@@ -156,7 +158,8 @@
+ 					ifcfg-*.*) ;;
+ 					*) continue ;;
+ 				esac
+-				ONBOOT=""; . "$i" 2>/dev/null
++				ONBOOT=""; USERS=""; . "$i" 2>/dev/null
++				[ ${USERS:-no} != no ] && continue
+ 				[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
+ 			done
+ 		`
+@@ -167,7 +170,8 @@
+ 					ifcfg-br*) ;;
+ 					*) continue ;;
+ 				esac
+-				ONBOOT=""; . "$i" 2>/dev/null
++				ONBOOT=""; USERS=""; . "$i" 2>/dev/null
++				[ ${USERS:-no} != no ] && continue
+ 				[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
+ 			done
+ 		`
+@@ -178,7 +182,8 @@
+ 					ifcfg-sit*) ;;
+ 					*) continue ;;
+ 				esac
+-				ONBOOT=""; . "$i" 2>/dev/null
++				ONBOOT=""; USERS=""; . "$i" 2>/dev/null
++				[ ${USERS:-no} != no ] && continue
+ 				[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
+ 			done
+ 		`
+@@ -186,7 +191,8 @@
+ 
+ 	tunnels=$(
+ 		for i in $(network_interface_configs 'tnlcfg-*'); do
+-			ONBOOT=""; . "$i" 2>/dev/null
++			ONBOOT=""; USERS=""; . "$i" 2>/dev/null
++			[ ${USERS:-no} != no ] && continue
+ 			[ ${ONBOOT:-no} = yes ] && echo "${i##*/tnlcfg-}"
+ 		done
+ 	)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts.spec?r1=1.381&r2=1.382&f=u