Changeset 97c9690 in freewrt for package/fwifupdown/files

Timestamp:

May 1, 2007, 9:15:21 PM (19 years ago)

Author:

Christian Fischer <spaetzle@…>

Children:

ce12392

Parents:

44d850e

Message:

dhcp pidfile fixes

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@2444 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• package/fwifupdown/files/main.sh (modified) (2 diffs)

package/fwifupdown/files/main.sh

@@ -340 +340 @@
                 then
                         err=$(eval $IF_DHCPCLIENT ${IF_DHCPCLIENT_OPTS:-""} 2>&1 1>&-) || mprint -s "main_dhcp_up: $err" &
-                        return 0
+                        if [ -n ${!:-""} ]
+                        then
+                                mkdir -p /var/run/dhcpc
+                                echo $! > /var/run/dhcpc/${IF_DHCPCLIENT}.${IFACE}.pid
+                                return 0
+                        else
+                                mprint -s "main_dhcp_up: dhcp client start failed"
+                                return 1
+                        fi
                 fi
                 mprint -s "$IF_DHCPCCLIENT not found, using builtin udhcpcd"
         fi
 
-        if ! err=$(udhcpc -b -t 0 -p /var/run/udhcpc.${IFACE}.pid -i $IFACE ${IF_HOSTNAME:+"-H $IF_HOSTNAME"} ${IF_CLIENTID:+"-c $IF_CLIENTID"} \
+        if ! err=$(udhcpc -b -t 0 -p /var/run/dhcpc/udhcpc.${IFACE}.pid -i $IFACE ${IF_HOSTNAME:+"-H $IF_HOSTNAME"} ${IF_CLIENTID:+"-c $IF_CLIENTID"} \
                                 ${IF_SCRIPT:+"-s $IF_SCRIPT"} 2>&1 1>&-)
         then
@@ -356 +364 @@
 
 main_dhcp_down() {
-        local err
-
-        if [ -f /var/run/udhcpc.${IFACE}.pid ]
-        then
-                err=$(kill -TERM "$(cat /var/run/udhcpc.${IFACE}.pid)" 2>&1 1>&-) || mprint -s "main_dhcp_down: $err"
-        fi
+        local err pid
+
+        for pidfile in /var/run/dhcpc/*
+        do
+                if grep -q .${IFACE}. $pidfile
+                then
+                        pid="$(cat $pidfile 2>&-)"
+                        if [ -n "$pid" ] -a -d "/proc/$pid" ]
+                        then
+                                err=$(kill -TERM $pid 2>&1 1>&-) || mprint -s "main_dhcp_down: $err"
+                                rm -f $pidfile 2>&-
+                        fi
+                fi
+        done
 
         if is_up