X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=rc.d%2Finit.d%2Fnetwork;h=cf670a74a19899f20252996e10267a07236307d9;hb=HEAD;hp=3592a2b476f104eb83fb047236aa5df875882c21;hpb=12e7a5b1a4ca9c8f03ee66db198426770cc84300;p=rc-scripts.git

diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index 3592a2b..cf670a7 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -130,7 +130,7 @@ network_interface_configs() {
 
 find_boot_interfaces() {
 	ifcfg_files="$(network_interface_configs 'ifcfg-*')"
-	bootprio=$(grep '^BOOTPRIO=' $ifcfg_files)
+	bootprio=$(grep '^BOOTPRIO=' $ifcfg_files 2>/dev/null)
 
 	if [ -n "$bootprio" ]; then
 		# find all the interfaces besides loopback.
@@ -143,7 +143,7 @@ find_boot_interfaces() {
 				DEVICE=""; ONBOOT=""; USERS=""; . "$i" 2>/dev/null
 				[ "${DEVICE:+set}" != "set" ] && continue
 				[ ${USERS:-no} != no ] && continue
-				[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
+				is_yes ${ONBOOT:-no} && echo "${i##*/ifcfg-}"
 			done
 		`
 	else
@@ -155,7 +155,7 @@ find_boot_interfaces() {
 				DEVICE=""; ONBOOT=""; USERS=""; . "$i" 2>/dev/null
 				[ "${DEVICE:+set}" != "set" ] && continue
 				[ ${USERS:-no} != no ] && continue
-				[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
+				is_yes ${ONBOOT:-no} && echo "${i##*/ifcfg-}"
 			done
 		`
 
@@ -168,7 +168,7 @@ find_boot_interfaces() {
 				DEVICE=""; ONBOOT=""; USERS=""; . "$i" 2>/dev/null
 				[ "${DEVICE:+set}" != "set" ] && continue
 				[ ${USERS:-no} != no ] && continue
-				[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
+				is_yes ${ONBOOT:-no} && echo "${i##*/ifcfg-}"
 			done
 		`
 
@@ -181,7 +181,7 @@ find_boot_interfaces() {
 				DEVICE=""; ONBOOT=""; USERS=""; . "$i" 2>/dev/null
 				[ "${DEVICE:+set}" != "set" ] && continue
 				[ ${USERS:-no} != no ] && continue
-				[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
+				is_yes ${ONBOOT:-no} && echo "${i##*/ifcfg-}"
 			done
 		`
 
@@ -194,7 +194,7 @@ find_boot_interfaces() {
 				DEVICE=""; ONBOOT=""; USERS=""; . "$i" 2>/dev/null
 				[ "${DEVICE:+set}" != "set" ] && continue
 				[ ${USERS:-no} != no ] && continue
-				[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
+				is_yes ${ONBOOT:-no} && echo "${i##*/ifcfg-}"
 			done
 		`
 
@@ -207,7 +207,7 @@ find_boot_interfaces() {
 				DEVICE=""; ONBOOT=""; USERS=""; . "$i" 2>/dev/null
 				[ "${DEVICE:+set}" != "set" ] && continue
 				[ ${USERS:-no} != no ] && continue
-				[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
+				is_yes ${ONBOOT:-no} && echo "${i##*/ifcfg-}"
 			done
 		`
 	fi
@@ -217,7 +217,7 @@ find_boot_interfaces() {
 			DEVICE=""; ONBOOT=""; USERS=""; . "$i" 2>/dev/null
 			[ "${DEVICE:+set}" != "set" ] && continue
 			[ ${USERS:-no} != no ] && continue
-			[ ${ONBOOT:-no} = yes ] && echo "${i##*/tnlcfg-}"
+			is_yes ${ONBOOT:-no} && echo "${i##*/tnlcfg-}"
 		done
 	)
 }
@@ -356,11 +356,7 @@ find_boot_interfaces
 # See how we were called.
 case "$1" in
   start)
-	if is_yes "$VSERVER_ISOLATION_NET"; then
-		touch /var/lock/subsys/network
-	else
-		start
-	fi
+	start
 	;;
   start_init)
 	network_init
@@ -374,11 +370,7 @@ case "$1" in
 	rm -f /var/lock/subsys/network
 	;;
   stop)
-	if is_yes "$VSERVER_ISOLATION_NET"; then
-		rm -f /var/lock/subsys/network >/dev/null 2>&1
-	else
-		stop
-	fi
+	stop
 	;;
 
   status)
@@ -394,18 +386,11 @@ case "$1" in
 	;;
 
   reload)
-	if is_yes "$VSERVER_ISOLATION_NET"; then
-		exit 0
-	fi
 	shift
 	reload ${1:+"$@"}
 	;;
 
   restart)
-	if is_yes "$VSERVER_ISOLATION_NET"; then
-		exit 0
-	fi
-
 	stop
 	start
 	;;