aboutsummaryrefslogtreecommitdiff
path: root/netcfg
diff options
context:
space:
mode:
authorJudd Vinet <judd@archlinux.org>2005-12-07 00:21:45 +0000
committerJudd Vinet <judd@archlinux.org>2005-12-07 00:21:45 +0000
commitd768a9c95a254e09a34c39aa86840c01cb6d97dd (patch)
tree00952a5e4b0530ab1dd26fa2c7a44908c4ef9247 /netcfg
parentf45c3abd5697fa89d1a6431d8dbf5e96e6804ca8 (diff)
downloadinitscripts-d768a9c95a254e09a34c39aa86840c01cb6d97dd.tar.xz
changed both network scripts to use good ol' /bin/kill instead of dhcpcd's -k switch (I forgot about #2942)
Diffstat (limited to 'netcfg')
-rwxr-xr-xnetcfg4
1 files changed, 2 insertions, 2 deletions
diff --git a/netcfg b/netcfg
index 6582d3d..76e387c 100755
--- a/netcfg
+++ b/netcfg
@@ -52,7 +52,7 @@ stop_profile()
[ "$USEWPA" = "yes" -o "$USEWPA" = "YES" ] && wpa_cli terminate >/dev/null 2>&1
# bring down dhcpcd if we're using it
- [ "$IFOPTS" = "dhcp" -o "$IFOPTS" = "DHCP" ] && dhcpcd -k $INTERFACE
+ [ "$IFOPTS" = "dhcp" -o "$IFOPTS" = "DHCP" ] && kill `cat /etc/dhcpc/dhcpcd-${INTERFACE}.pid`
# bring down the interface itself
ifconfig $INTERFACE down
@@ -198,7 +198,7 @@ menu()
# if no default yet, use the first entry
[ "$DEFAULT" = "" ] && DEFAULT=${profiles[0]}
- ANSWER=`mktemp`
+ ANSWER=`mktemp` || exit 1
if [ "$TIMEOUT" != "" ]; then
dialog \