[patch] fixed bring lo up too early

ifconfig.patch (text/plain), 1.46 KB, created by Roy Marples (RETIRED) on 2005-08-31 23:41:11 UTC

Common subdirectories: net.modules.d/helpers.d and /lib/rcscripts/net.modules.d/helpers.d
diff -u net.modules.d/ifconfig /lib/rcscripts/net.modules.d/ifconfig
--- net.modules.d/ifconfig	2005-08-30 18:49:36.000000000 +0100
+++ /lib/rcscripts/net.modules.d/ifconfig	2005-09-01 07:26:36.000000000 +0100
@@ -325,7 +325,6 @@
 	local iface="$1" i=0 r e
 
 	ifconfig_exists "${iface}" true || return 1
-	ifconfig_up "${iface}"
 	
 	# Extract the config
 	local -a config=( "$@" )
@@ -360,19 +359,17 @@
 		config=( "${config[@]//peer/pointtopoint}" )
 	fi
 
+	# Ensure that the interface is up so we can add IPv6 addresses
+	interface_up "${iface}"
+
 	# Some kernels like to apply lo with an address when they are brought up
-	if [[ ${iface} == "lo" \
-		|| ${config[@]} == "127.0.0.1/8 broadcast 127.255.255.255" ]]; then
-		ifconfig "${iface}" ${config[@]} 2>/dev/null
-		r="0"
-	else
-		e=$( ifconfig "${iface}" ${config[@]} 2>&1 )
-		r="$?"
-		[[ ${r} != "0" ]] && echo "${e}" > /dev/stderr
+	if [[ ${iface} == "lo" && ${config[@]} == "127.0.0.1 netmask 255.0.0.0 broadcast 127.255.255.255" ]]; then
+		ifconfig "${iface}" 0.0.0.0
 	fi
-
-	[[ ${r} != "0" || ${config[0]} == "inet6"* || ${iface} == *:* ]] \
-	&& return ${r}
+		
+	ifconfig "${iface}" ${config[@]}
+	r="$?"
+	[[ ${r} != "0" ]] && return ${r}
 
 	local metric ifvar=$( bash_variable "${iface}" )
 	# Remove the newly added route and replace with our metric
Only in /lib/rcscripts/net.modules.d: .keep
Only in net.modules.d: .svn