[Astlinux-commits] SF.net SVN: astlinux:[6062] branches/1.0/project/astlinux/target_skeleton/ etc/init.d/network

[<abe...@us...>]

Revision: 6062
          http://sourceforge.net/p/astlinux/code/6062
Author:   abelbeck
Date:     2013-04-30 00:32:28 +0000 (Tue, 30 Apr 2013)
Log Message:
-----------
network, add an instance of ifplugd for a possible EXT2IF udhcpc

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/etc/init.d/network

Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/network	2013-04-28 20:31:42 UTC (rev 6061)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/network	2013-04-30 00:32:28 UTC (rev 6062)
@@ -506,6 +506,7 @@
   #DHCP
   if [ -n "$EXT2IF" -a -z "$EXT2IP" ] && ! isextppp ext2if; then
     udhcpc -b -s /etc/udhcpc.script -H $HOSTNAME -p /var/run/udhcpc-$EXT2IF.pid -i $EXT2IF
+    ifplugd -apqs -t2 -u3 -d3 -i $EXT2IF -r /etc/ifplugd/udhcpc.action
   fi
 
   ##DMZ Network
@@ -527,28 +528,23 @@
 }
 
 stop () {
-  local IF
+  local IF PID
 
   if [ "$IPV6" = "yes" -a -n "$IPV6_TUNNEL" ]; then
     echo "Bringing down IPv6 tunnel..."
     ipv6_tunnel stop
   fi
 
-  if [ -n "$EXTIF" -a -f /var/run/ifplugd.$EXTIF.pid ]; then
+  for PID in $(ls -1 /var/run/ifplugd.*.pid 2>/dev/null); do
     echo "Stopping ifplugd..."
-    kill $(cat /var/run/ifplugd.$EXTIF.pid)
-  fi
+    kill $(cat "$PID")
+  done
 
-  if [ -n "$EXTIF" -a -z "$EXTIP" -a -f /var/run/udhcpc-$EXTIF.pid ]; then
+  for PID in $(ls -1 /var/run/udhcpc-*.pid 2>/dev/null); do
     echo "Stopping udhcpc..."
-    kill $(cat /var/run/udhcpc-$EXTIF.pid)
-  fi
+    kill $(cat "$PID")
+  done
 
-  if [ -n "$EXT2IF" -a -z "$EXT2IP" -a -f /var/run/udhcpc-$EXT2IF.pid ]; then
-    echo "Stopping udhcpc..."
-    kill $(cat /var/run/udhcpc-$EXT2IF.pid)
-  fi
-
   if [ -f /var/run/ppp0.pid ]; then
     kill $(cat /var/run/ppp0.pid)
   fi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.