functions.network: cleanup dhcp stop script.
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 8 Jul 2013 20:32:42 +0000 (22:32 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 8 Jul 2013 20:32:42 +0000 (22:32 +0200)
src/initscripts/init.d/networking/functions.network [changed mode: 0755->0644]
src/initscripts/init.d/networking/red [changed mode: 0755->0644]
src/initscripts/init.d/networking/wpa_supplicant.exe [changed mode: 0755->0644]
src/initscripts/init.d/wlanclient [changed mode: 0755->0644]

old mode 100755 (executable)
new mode 100644 (file)
index b1ce220..d52b301
@@ -123,34 +123,25 @@ dhcpcd_stop() {
                exit 1
        fi
 
-       # Check if we got a valid lease.
-       if [ -e $leaseinfo ]; then
-               . $leaseinfo
-               if [ "$dchp_lease_time" = "4294967295" ]; then
-                       # do nothing, just echo ok
-                       echo_ok
-               else
-                       # Stop dhcpcd.
-                       /sbin/dhcpcd "${device}" "${dhcp_stop}" &> /dev/null
-                       ret="$?"
-
-                       # Wait until dhcpd has stopped.
-                       while [ -d "/proc/${pid}" ]; do
-                               sleep 1
-                       done
-
-                       # Display console message, depended on the exit code
-                       # of the stopped dhcpcd.
-                       if [ "${ret}" -eq 0 ]; then
-                               boot_mesg
-                               echo_ok
-                       elif [ "${ret}" -eq 1 ]; then
-                               boot_mesg "failed to stop dhcpcd!" ${WARNING}
-                               echo_warning
-                       else
-                               boot_mesg
-                               echo_failure
-                       fi
-               fi
+       # Stop dhcpcd.
+       /sbin/dhcpcd "${device}" "${dhcp_stop}" &> /dev/null
+       ret="$?"
+
+       # Wait until dhcpd has stopped.
+       while [ -d "/proc/${pid}" ]; do
+               sleep 1
+       done
+
+       # Display console message, depended on the exit code
+       # of the stopped dhcpcd.
+       if [ "${ret}" -eq 0 ]; then
+               boot_mesg
+               echo_ok
+       elif [ "${ret}" -eq 1 ]; then
+               boot_mesg "failed to stop dhcpcd!" ${WARNING}
+               echo_warning
+       else
+               boot_mesg
+               echo_failure
        fi
 }
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)