summaryrefslogtreecommitdiff
path: root/testing/dhcp/dhclient-script-pathFixes.patch
blob: a4143dddef5f2ecc17960a1b0a0912609aa2ae4d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
--- linux	2011-05-18 20:01:54.000000000 +0000
+++ linux_new	2011-12-21 18:45:41.487171012 +0000
@@ -23,7 +23,7 @@
 # of the $1 in its args.
 
 # 'ip' just looks too weird.  /sbin/ip looks less weird.
-ip=/sbin/ip
+ip=/usr/sbin/ip
 
 make_resolv_conf() {
   if [ x"$new_domain_name_servers" != x ]; then
@@ -122,9 +122,9 @@
 if [ x$reason = xPREINIT ]; then
   if [ x$alias_ip_address != x ]; then
     # Bring down alias interface. Its routes will disappear too.
-    ifconfig $interface:0- inet 0
+    /sbin/ifconfig $interface:0- inet 0
   fi
-  ifconfig $interface 0 up
+  /sbin/ifconfig $interface 0 up
 
   # We need to give the kernel some time to get the interface up.
   sleep 1
@@ -151,25 +151,25 @@
   if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
 		[ x$alias_ip_address != x$old_ip_address ]; then
     # Possible new alias. Remove old alias.
-    ifconfig $interface:0- inet 0
+    /sbin/ifconfig $interface:0- inet 0
   fi
   if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
     # IP address changed. Bringing down the interface will delete all routes,
     # and clear the ARP cache.
-    ifconfig $interface inet 0 down
+    /sbin/ifconfig $interface inet 0 down
 
   fi
   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
 
-    ifconfig $interface inet $new_ip_address $new_subnet_arg \
+    /sbin/ifconfig $interface inet $new_ip_address $new_subnet_arg \
 					$new_broadcast_arg $mtu_arg
     # Add a network route to the computed network address.
     for router in $new_routers; do
       if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
-	route add -host $router dev $interface
+	/sbin/route add -host $router dev $interface
       fi
-      route add default gw $router $metric_arg dev $interface
+      /sbin/route add default gw $router $metric_arg dev $interface
     done
   else
     # we haven't changed the address, have we changed other options           
@@ -177,21 +177,21 @@
     if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then
       # if we've changed routers delete the old and add the new.
       for router in $old_routers; do
-        route del default gw $router
+        /sbin/route del default gw $router
       done
       for router in $new_routers; do
         if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
-	  route add -host $router dev $interface
+	  /sbin/route add -host $router dev $interface
 	fi
-	route add default gw $router $metric_arg dev $interface
+	/sbin/route add default gw $router $metric_arg dev $interface
       done
     fi
   fi
   if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
    then
-    ifconfig $interface:0- inet 0
-    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-    route add -host $alias_ip_address $interface:0
+    /sbin/ifconfig $interface:0- inet 0
+    /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+    /sbin/route add -host $alias_ip_address $interface:0
   fi
   make_resolv_conf
   exit_with_hooks 0
@@ -201,42 +201,42 @@
    || [ x$reason = xSTOP ]; then
   if [ x$alias_ip_address != x ]; then
     # Turn off alias interface.
-    ifconfig $interface:0- inet 0
+    /sbin/ifconfig $interface:0- inet 0
   fi
   if [ x$old_ip_address != x ]; then
     # Shut down interface, which will delete routes and clear arp cache.
-    ifconfig $interface inet 0 down
+    /sbin/ifconfig $interface inet 0 down
   fi
   if [ x$alias_ip_address != x ]; then
-    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-    route add -host $alias_ip_address $interface:0
+    /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+    /sbin/route add -host $alias_ip_address $interface:0
   fi
   exit_with_hooks 0
 fi
 
 if [ x$reason = xTIMEOUT ]; then
   if [ x$alias_ip_address != x ]; then
-    ifconfig $interface:0- inet 0
+    /sbin/ifconfig $interface:0- inet 0
   fi
-  ifconfig $interface inet $new_ip_address $new_subnet_arg \
+  /sbin/ifconfig $interface inet $new_ip_address $new_subnet_arg \
 					$new_broadcast_arg $mtu_arg
   set $new_routers
   if ping -q -c 1 $1; then
     if [ x$new_ip_address != x$alias_ip_address ] && \
 			[ x$alias_ip_address != x ]; then
-      ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-      route add -host $alias_ip_address dev $interface:0
+      /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+      /sbin/route add -host $alias_ip_address dev $interface:0
     fi
     for router in $new_routers; do
       if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
-	route add -host $router dev $interface
+	/sbin/route add -host $router dev $interface
       fi
-      route add default gw $router $metric_arg dev $interface
+      /sbin/route add default gw $router $metric_arg dev $interface
     done
     make_resolv_conf
     exit_with_hooks 0
   fi
-  ifconfig $interface inet 0 down
+  /sbin/ifconfig $interface inet 0 down
   exit_with_hooks 1
 fi