File sysconfig_wrong_usage_of_ps.326101.patch of Package sysconfig

File sysconfig_wrong_usage_of_ps.326101.patch of Package sysconfig (Revision 1)

Currently displaying revision 1, show latest

--- scripts/functions
+++ scripts/functions
@@ -536,13 +536,13 @@
 		retval=0
 		test "$1" == "-q" && break
 		echo $pid
-	done < <(ps ax | grep -s "[ /]$DHCLIENT\>.*\<$INTERFACE\>")
+	done < <(ps axww | grep -s "[ /]$DHCLIENT\>.*\<$INTERFACE\>")
 	return $retval
 }
 
 # returns 0 if ifup is currently working on this interface
 ifup_on_iface() {
-	ps ax | grep -qs "[i]fup.* $INTERFACE\>"
+	ps axww | grep -qs "[i]fup.* $INTERFACE\>"
 }
 
 dhcp-interfaces() {
--- scripts/ifup-dhcp
+++ scripts/ifup-dhcp
@@ -34,25 +34,6 @@
 	exit $R_USAGE
 }
 
-# returns 0 if there is a dhcp client running on this interface
-# prints pids of all dhcp clients on this interface
-# prints nothing if called with option '-q'
-# Usually it should not happen that more then one dhcpcd is running on one
-# interface, but it may happen. So better safe than sorry!
-dhcpc_on_iface() {
-	local pid line retval=1
-	while read pid line; do
-		retval=0
-		test "$1" == "-q" && break
-		echo $pid
-	done < <(ps ax | grep -s "[ /]$DHCLIENT\>.*\<$INTERFACE\>")
-	return $retval
-}
-
-ifup_on_iface() {
-	ps ax | grep -qs "[i]fup.* $INTERFACE\>"
-}
-
 ######################################################################
 # change the working direcory and source some common files
 #