From 98a6595a35e51c34bee9c66ab8d9fc4302d3301c Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Mon, 28 Apr 2008 12:11:03 -0400
Subject: Use a full path to /sbin/ip (#444378)

---
 NetworkManager/dispatcher.d/05-netfs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'NetworkManager/dispatcher.d/05-netfs')

diff --git a/NetworkManager/dispatcher.d/05-netfs b/NetworkManager/dispatcher.d/05-netfs
index b3ba12c7..089b7261 100755
--- a/NetworkManager/dispatcher.d/05-netfs
+++ b/NetworkManager/dispatcher.d/05-netfs
@@ -3,13 +3,13 @@
 export LC_ALL=C
 
 if [ "$2" = "down" ]; then
-	ip route ls | grep -q ^default || {
+	/sbin/ip route ls | grep -q ^default || {
 		[ -f /var/lock/subsys/netfs ] && /etc/rc.d/init.d/netfs stop
 	}
 fi
 
 if [ "$2" = "up" ]; then
-	defdev=$(ip route ls | awk '/^default/ { print $NF }')
+	defdev=$(/sbin/ip route ls | awk '/^default/ { print $NF }')
 	if [ "$defdev" = "$1" ]; then
 		/sbin/chkconfig netfs && /etc/rc.d/init.d/netfs start
 	fi
-- 
cgit 


From 8993d6ce77fd34fd17f5477d484caa6d36a4759e Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 7 May 2008 13:46:55 -0400
Subject: Fix check for default route, so that netfs gets started correctly
 (#445509)

---
 NetworkManager/dispatcher.d/05-netfs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'NetworkManager/dispatcher.d/05-netfs')

diff --git a/NetworkManager/dispatcher.d/05-netfs b/NetworkManager/dispatcher.d/05-netfs
index 089b7261..46d4bb42 100755
--- a/NetworkManager/dispatcher.d/05-netfs
+++ b/NetworkManager/dispatcher.d/05-netfs
@@ -9,9 +9,8 @@ if [ "$2" = "down" ]; then
 fi
 
 if [ "$2" = "up" ]; then
-	defdev=$(/sbin/ip route ls | awk '/^default/ { print $NF }')
-	if [ "$defdev" = "$1" ]; then
+	/sbin/ip -o route show dev "$1" | grep -q '^default' && {
 		/sbin/chkconfig netfs && /etc/rc.d/init.d/netfs start
-	fi
+	}
 fi
 
-- 
cgit