X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Flib%2Fpreinit%2F10_indicate_preinit;h=1fab8a20ad99044b96600350e5e12f59dc4e37b5;hp=cd3ca5571a021f64858a049b5d69cea48380d2aa;hb=99646afc4f797d1ec720184239b9edb8b5b4b9af;hpb=a9929695c6ad0779eaa8cb3d68d37760981d55b7

diff --git a/package/base-files/files/lib/preinit/10_indicate_preinit b/package/base-files/files/lib/preinit/10_indicate_preinit
index cd3ca5571a..1fab8a20ad 100644
--- a/package/base-files/files/lib/preinit/10_indicate_preinit
+++ b/package/base-files/files/lib/preinit/10_indicate_preinit
@@ -3,50 +3,45 @@
 # Copyright (C) 2010 Vertical Communications
 
 preinit_ip() {
-    # if the preinit interface isn't specified and ifname is set in 
-    # preinit.arch use that interface
-    if [ -z "$pi_ifname" ]; then
-	pi_ifname=$ifname    
-    fi
-
-    [ -n "$pi_ifname" ] && grep "$pi_ifname" /proc/net/dev >/dev/null && {
-	ifconfig $pi_ifname $pi_ip netmask $pi_netmask broadcast $pi_broadcast up
-    }
+	# if the preinit interface isn't specified and ifname is set in
+	# preinit.arch use that interface
+	if [ -z "$pi_ifname" ]; then
+		pi_ifname=$ifname
+	fi
+
+	[ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && {
+		ip link set dev $pi_ifname up
+		ip -4 address add $pi_ip/$pi_netmask broadcast $pi_broadcast dev $pi_ifname
+	}
 }
 
 preinit_ip_deconfig() {
-    [ -n "$pi_ifname" ] && grep "$pi_ifname" /proc/net/dev >/dev/null && {
-	ifconfig $pi_ifname 0.0.0.0 down
-    }
+	[ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && {
+		ip -4 address flush dev $pi_ifname
+		ip link set dev $pi_ifname down
+	}
 }
 
 preinit_net_echo() {
-	[ -n "$pi_ifname" ] && grep "$pi_ifname" /proc/net/dev >/dev/null && {
-		{ 
+	[ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && {
+		{
 			[ "$pi_preinit_net_messages" = "y" ] || {
-    		     		[ "$pi_failsafe_net_message"  = "true" ] && 
-    		         	    [ "$pi_preinit_no_failsafe_netmsg" != "y" ] 
-    		         }
-	    			
+				[ "$pi_failsafe_net_message" = "true" ] &&
+					[ "$pi_preinit_no_failsafe_netmsg" != "y" ]
+			}
 		} && netmsg $pi_broadcast "$1"
-    	}
+	}
 }
 
 preinit_echo() {
-    preinit_net_echo $1
-    echo $1
-}
-
-pi_indicate_led() {
-    set_state preinit
+	preinit_net_echo $1
+	echo $1
 }
 
 pi_indicate_preinit() {
-    echo "- preinit -"
-    preinit_net_echo "Doing OpenWRT Preinit\n"
-    pi_indicate_led
+	preinit_net_echo "Doing OpenWrt Preinit\n"
+	set_state preinit
 }
 
 boot_hook_add preinit_main preinit_ip
 boot_hook_add preinit_main pi_indicate_preinit
-