Attachment 870605 Details for Bug 1068621 – patch to initscripts git

[patch] patch to initscripts git

0001-network-ignore-NM-controlled-devices-1068621-etc.patch (text/plain), 1.98 KB, created by Dan Winship on 2014-03-04 19:15:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Winship

Created: 2014-03-04 19:15:01 UTC

Size: 1.98 KB

patch

obsolete

>From 979c506b6836656d2669ec551502f1cee821289f Mon Sep 17 00:00:00 2001
>From: Dan Winship <danw@gnome.org>
>Date: Tue, 4 Mar 2014 14:00:15 -0500
>Subject: [PATCH] network: ignore NM-controlled devices (#1068621, etc)
>
>---
> rc.d/init.d/network | 26 +++++++++++++++++++++-----
> 1 file changed, 21 insertions(+), 5 deletions(-)
>
>diff --git a/rc.d/init.d/network b/rc.d/init.d/network
>index 129042f..d604e9a 100755
>--- a/rc.d/init.d/network
>+++ b/rc.d/init.d/network
>@@ -41,12 +41,24 @@ cd /etc/sysconfig/network-scripts
> 
> # find all the interfaces besides loopback.
> # ignore aliases, alternative configurations, and editor backup files
>-interfaces=$(ls ifcfg-* | \
>+all_interfaces=$(ls ifcfg-* | \
> 	    LC_ALL=C sed -e "$__sed_discard_ignored_files" \
> 		       -e '/$ifcfg-lo$\|:\|ifcfg-.*-range$/d' \
> 		       -e '{ s/^ifcfg-//g;s/[0-9]/ &/}' | \
> 	    LC_ALL=C sort -k 1,1 -k 2n | \
> 	    LC_ALL=C sed 's/ //')
>+
>+# figure out which are managed by this script
>+if is_nm_running; then
>+	for i in $all_interfaces; do
>+		if [ -z "$(get_uuid_by_config ifcfg-$i)" ]; then
>+			interfaces="$interfaces $i"
>+		fi
>+	done
>+else
>+	interfaces="$all_interfaces"
>+fi
>+
> rc=0
> 
> # See how we were called.
>@@ -61,8 +73,10 @@ case "$1" in
>   
> 	apply_sysctl
> 
>-	# bring up loopback interface
>-	action $"Bringing up loopback interface: " ./ifup ifcfg-lo
>+	if [ ! is_true $nm_running ] ; then
>+		# bring up loopback interface
>+		action $"Bringing up loopback interface: " ./ifup ifcfg-lo
>+	fi
> 
> 	case "$VLAN" in
> 	  yes)
>@@ -214,7 +228,9 @@ case "$1" in
> 		)
> 	done
> 
>-	action $"Shutting down loopback interface: " ./ifdown ifcfg-lo
>+	if [ ! is_true $nm_running ] ; then
>+		action $"Shutting down loopback interface: " ./ifdown ifcfg-lo
>+	fi
> 
> 	sysctl -w net.ipv4.ip_forward=0 > /dev/null 2>&1
> 
>@@ -227,7 +243,7 @@ case "$1" in
>         ;;
>   status)
> 	echo $"Configured devices:"
>-	echo lo $interfaces
>+	echo lo $all_interfaces
> 
> 	echo $"Currently active devices:"
> 	echo $(/sbin/ip -o link show up | awk -F ": " '{ print $2 }')
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1068621: 867570 | 870605 | 873067