From d768a9c95a254e09a34c39aa86840c01cb6d97dd Mon Sep 17 00:00:00 2001
From: Judd Vinet <judd@archlinux.org>
Date: Wed, 7 Dec 2005 00:21:45 +0000
Subject: changed both network scripts to use good ol' /bin/kill instead of
 dhcpcd's -k switch (I forgot about #2942)

---
 netcfg  | 4 ++--
 network | 2 +-
 2 files changed, 3 insertions(+), 3 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 \
diff --git a/network b/network
index b3d13b9..5e33cc9 100755
--- a/network
+++ b/network
@@ -58,7 +58,7 @@ ifdown()
 	eval ifcfg="\$${1}"
 	if [ "$ifcfg" = "dhcp" ]; then
 		if [ -f /etc/dhcpc/dhcpcd-${1}.pid ]; then
-			/sbin/dhcpcd -k ${1}
+			kill `cat /etc/dhcpc/dhcpcd-${1}.pid`
 		else
 			# No .pid file, just bring the interface itself down
 			/sbin/ifconfig ${1} down
-- 
cgit v1.2.3