diff options
Diffstat (limited to 'meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch')
-rw-r--r-- | meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch b/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch index 37a61c9bc1..5b0d51d736 100644 --- a/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch +++ b/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 7efe4676747e4e4a056b9bfb4e9424c8354e9996 Mon Sep 17 00:00:00 2001 | 1 | From 6fce99c9e42cbacde1855473b745ca1fded3fbf7 Mon Sep 17 00:00:00 2001 |
2 | From: "Maxin B. John" <maxin.john@intel.com> | 2 | From: "Maxin B. John" <maxin.john@intel.com> |
3 | Date: Wed, 21 Dec 2016 15:32:07 +0200 | 3 | Date: Wed, 21 Dec 2016 15:32:07 +0200 |
4 | Subject: [PATCH] inet[6].defn: fix inverted checks for loopback | 4 | Subject: [PATCH 2/2] inet[6].defn: fix inverted checks for loopback |
5 | 5 | ||
6 | Compared to the hurd link.defn for loopback, we see these | 6 | Compared to the hurd link.defn for loopback, we see these |
7 | are inverted, meaning that you would only be able to configure | 7 | are inverted, meaning that you would only be able to configure |
@@ -37,11 +37,11 @@ Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> | |||
37 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | 37 | Signed-off-by: Maxin B. John <maxin.john@intel.com> |
38 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 38 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
39 | --- | 39 | --- |
40 | inet.defn | 140 +++++++++++++++++++++++++++++++------------------------------- | 40 | inet.defn | 134 +++++++++++++++++++++++++++--------------------------- |
41 | 1 file changed, 70 insertions(+), 70 deletions(-) | 41 | 1 file changed, 67 insertions(+), 67 deletions(-) |
42 | 42 | ||
43 | diff --git a/inet.defn b/inet.defn | 43 | diff --git a/inet.defn b/inet.defn |
44 | index 75e6744..23c7756 100644 | 44 | index 182b56b..31067bc 100644 |
45 | --- a/inet.defn | 45 | --- a/inet.defn |
46 | +++ b/inet.defn | 46 | +++ b/inet.defn |
47 | @@ -6,10 +6,10 @@ method loopback | 47 | @@ -6,10 +6,10 @@ method loopback |
@@ -103,9 +103,9 @@ index 75e6744..23c7756 100644 | |||
103 | 103 | ||
104 | up | 104 | up |
105 | - [[/bin/ip link set dev %iface% address %hwaddress%]] | 105 | - [[/bin/ip link set dev %iface% address %hwaddress%]] |
106 | - /sbin/dhclient -v -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \ | 106 | - /sbin/dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \ |
107 | + [[ip link set dev %iface% address %hwaddress%]] | 107 | + [[ip link set dev %iface% address %hwaddress%]] |
108 | + dhclient -v -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \ | 108 | + dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \ |
109 | [[-e IF_METRIC=%metric%]] \ | 109 | [[-e IF_METRIC=%metric%]] \ |
110 | if (execable("/sbin/dhclient")) | 110 | if (execable("/sbin/dhclient")) |
111 | - /sbin/pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \ | 111 | - /sbin/pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \ |
@@ -122,14 +122,13 @@ index 75e6744..23c7756 100644 | |||
122 | elsif (1) | 122 | elsif (1) |
123 | 123 | ||
124 | down | 124 | down |
125 | - /sbin/dhclient -v -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \ | 125 | - /sbin/dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \ |
126 | + dhclient -v -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \ | 126 | + dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \ |
127 | if (execable("/sbin/dhclient")) | 127 | if (execable("/sbin/dhclient")) |
128 | - /sbin/pump -i %iface% -r \ | 128 | - /sbin/pump -i %iface% -r \ |
129 | + pump -i %iface% -r \ | 129 | + pump -i %iface% -r \ |
130 | elsif (execable("/sbin/pump")) | 130 | elsif (execable("/sbin/pump")) |
131 | - if test -f /run/udhcpc.%iface%.pid; then kill -USR2 $(/bin/cat /run/udhcpc.%iface%.pid); kill -TERM $(/bin/cat /run/udhcpc.%iface%.pid); fi \ | 131 | if test -f /run/udhcpc.%iface%.pid; then kill -USR2 $(/bin/cat /run/udhcpc.%iface%.pid); kill -TERM $(/bin/cat /run/udhcpc.%iface%.pid); fi \ |
132 | + if test -f /run/udhcpc.%iface%.pid; then kill -USR2 $(cat /run/udhcpc.%iface%.pid); kill -TERM $(cat /run/udhcpc.%iface%.pid); fi \ | ||
133 | elsif (execable("/sbin/udhcpc")) | 132 | elsif (execable("/sbin/udhcpc")) |
134 | - /sbin/dhcpcd -k %iface% \ | 133 | - /sbin/dhcpcd -k %iface% \ |
135 | + dhcpcd -k %iface% \ | 134 | + dhcpcd -k %iface% \ |
@@ -252,9 +251,9 @@ index 75e6744..23c7756 100644 | |||
252 | 251 | ||
253 | up | 252 | up |
254 | - [[/sbin/ifconfig %iface% link %hwaddress%]] | 253 | - [[/sbin/ifconfig %iface% link %hwaddress%]] |
255 | - /sbin/dhclient -v -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \ | 254 | - /sbin/dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \ |
256 | + [[ifconfig %iface% link %hwaddress%]] | 255 | + [[ifconfig %iface% link %hwaddress%]] |
257 | + dhclient -v -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \ | 256 | + dhclient -4 -v -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \ |
258 | [[-e IF_METRIC=%metric%]] \ | 257 | [[-e IF_METRIC=%metric%]] \ |
259 | if (execable("/sbin/dhclient")) | 258 | if (execable("/sbin/dhclient")) |
260 | - /sbin/udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-H %hostname%]] \ | 259 | - /sbin/udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-H %hostname%]] \ |
@@ -269,11 +268,10 @@ index 75e6744..23c7756 100644 | |||
269 | elsif (1) | 268 | elsif (1) |
270 | 269 | ||
271 | down | 270 | down |
272 | - /sbin/dhclient -v -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \ | 271 | - /sbin/dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \ |
273 | + dhclient -v -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \ | 272 | + dhclient -4 -v -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \ |
274 | if (execable("/sbin/dhclient")) | 273 | if (execable("/sbin/dhclient")) |
275 | - if test -f /run/udhcpc.%iface%.pid; then kill -USR2 $(/bin/cat /run/udhcpc.%iface%.pid); kill -TERM $(/bin/cat /run/udhcpc.%iface%.pid); fi \ | 274 | if test -f /run/udhcpc.%iface%.pid; then kill -USR2 $(/bin/cat /run/udhcpc.%iface%.pid); kill -TERM $(/bin/cat /run/udhcpc.%iface%.pid); fi \ |
276 | + if test -f /run/udhcpc.%iface%.pid; then kill -USR2 $(cat /run/udhcpc.%iface%.pid); kill -TERM $(cat /run/udhcpc.%iface%.pid); fi \ | ||
277 | elsif (execable("/sbin/udhcpc")) | 275 | elsif (execable("/sbin/udhcpc")) |
278 | - /sbin/dhcpcd -k %iface% \ | 276 | - /sbin/dhcpcd -k %iface% \ |
279 | + dhcpcd -k %iface% \ | 277 | + dhcpcd -k %iface% \ |
@@ -341,8 +339,8 @@ index 75e6744..23c7756 100644 | |||
341 | 339 | ||
342 | up | 340 | up |
343 | [[Warning: Option hwaddress: %hwaddress% not yet supported]] | 341 | [[Warning: Option hwaddress: %hwaddress% not yet supported]] |
344 | - /sbin/dhclient -v -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \ | 342 | - /sbin/dhclient -4 -v -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \ |
345 | + dhclient -v -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \ | 343 | + dhclient -4 -v -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \ |
346 | if (execable("/sbin/dhclient")) | 344 | if (execable("/sbin/dhclient")) |
347 | - /sbin/udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface% [[-H %hostname%]] \ | 345 | - /sbin/udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface% [[-H %hostname%]] \ |
348 | + udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface% [[-H %hostname%]] \ | 346 | + udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface% [[-H %hostname%]] \ |
@@ -356,11 +354,10 @@ index 75e6744..23c7756 100644 | |||
356 | elsif (1) | 354 | elsif (1) |
357 | 355 | ||
358 | down | 356 | down |
359 | - /sbin/dhclient -v -r -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \ | 357 | - /sbin/dhclient -4 -v -r -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \ |
360 | + dhclient -v -r -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \ | 358 | + dhclient -4 -v -r -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \ |
361 | if (execable("/sbin/dhclient")) | 359 | if (execable("/sbin/dhclient")) |
362 | - if test -f /run/udhcpc.%iface///.%.pid; then kill -USR2 $(/bin/cat /run/udhcpc.%iface///.%.pid); kill -TERM $(/bin/cat /run/udhcpc.%iface///.%.pid); fi \ | 360 | if test -f /run/udhcpc.%iface///.%.pid; then kill -USR2 $(/bin/cat /run/udhcpc.%iface///.%.pid); kill -TERM $(/bin/cat /run/udhcpc.%iface///.%.pid); fi \ |
363 | + if test -f /run/udhcpc.%iface///.%.pid; then kill -USR2 $(cat /run/udhcpc.%iface///.%.pid); kill -TERM $(cat /run/udhcpc.%iface///.%.pid); fi \ | ||
364 | elsif (execable("/sbin/udhcpc")) | 361 | elsif (execable("/sbin/udhcpc")) |
365 | - /sbin/dhcpcd -k %iface% \ | 362 | - /sbin/dhcpcd -k %iface% \ |
366 | + dhcpcd -k %iface% \ | 363 | + dhcpcd -k %iface% \ |
@@ -402,5 +399,5 @@ index 75e6744..23c7756 100644 | |||
402 | - /usr/sbin/avahi-autoipd --kill %iface% | 399 | - /usr/sbin/avahi-autoipd --kill %iface% |
403 | + avahi-autoipd --kill %iface% | 400 | + avahi-autoipd --kill %iface% |
404 | -- | 401 | -- |
405 | 2.7.4 | 402 | 2.17.1 |
406 | 403 | ||