diff options
| author | Yi Zhao <yi.zhao@windriver.com> | 2018-10-17 10:42:55 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-18 10:56:55 +0100 |
| commit | ff74cc841a9eae31e435564db2d7acefb5d4340e (patch) | |
| tree | 623404a5ea86a7dad5d3104af6addb41ae8f67ed | |
| parent | 7d9b08e37a7a6d86aca0ea891859ac4b56917066 (diff) | |
| download | poky-ff74cc841a9eae31e435564db2d7acefb5d4340e.tar.gz | |
ifupdown: fix issue for configuring loopback interface
The patch inet-6-.defn-fix-inverted-checks-for-loopback.patch introduced
an issue that ifup/ifdown can not configure loopback interface:
$ cat /etc/network/interfaces
auto lo
iface lo inet loopback
$ ifconfig -s
Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg
eth0 1500 0 1 0 0 0 74 0 0 0 BMRU
lo 65536 0 2 0 0 0 2 0 0 0 LRU
$ ifdown lo
$ ifconfig -s
Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg
eth0 1500 0 1 0 0 0 74 0 0 0 BMRU
lo 65536 0 2 0 0 0 2 0 0 0 LRU
The original patch is for 0.7.x and the change is not needed for 0.8.x.
Update the patch to make the ifup/ifdown can configure lo interface:
$ ifconfig -s
Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg
eth0 1500 0 0 0 0 0 77 0 0 0 BMRU
lo 65536 0 2 0 0 0 2 0 0 0 LRU
$ ifdown lo
$ ifconfig -s
Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg
eth0 1500 0 0 0 0 0 80 0 0 0 BMRU
$ ifup lo
$ ifconfig -s
Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg
eth0 1500 0 0 0 0 0 81 0 0 0 BMRU
lo 65536 0 2 0 0 0 2 0 0 0 LRU
(From OE-Core rev: f12c4f918048a7814505c5b931113ed8ab0115d9)
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch | 38 |
1 files changed, 11 insertions, 27 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 2013933b69..37a61c9bc1 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,4 +1,4 @@ | |||
| 1 | From d88af5aa0312ea18aac791d66661da79b7bcd032 Mon Sep 17 00:00:00 2001 | 1 | From 7efe4676747e4e4a056b9bfb4e9424c8354e9996 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] inet[6].defn: fix inverted checks for loopback |
| @@ -35,12 +35,13 @@ Upstream-Status: Inappropriate [OE specific] | |||
| 35 | 35 | ||
| 36 | Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> | 36 | 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 | --- | 39 | --- |
| 39 | inet.defn | 148 +++++++++++++++++++++++++++++++------------------------------- | 40 | inet.defn | 140 +++++++++++++++++++++++++++++++------------------------------- |
| 40 | 1 file changed, 74 insertions(+), 74 deletions(-) | 41 | 1 file changed, 70 insertions(+), 70 deletions(-) |
| 41 | 42 | ||
| 42 | diff --git a/inet.defn b/inet.defn | 43 | diff --git a/inet.defn b/inet.defn |
| 43 | index 75e6744..b5f5da2 100644 | 44 | index 75e6744..23c7756 100644 |
| 44 | --- a/inet.defn | 45 | --- a/inet.defn |
| 45 | +++ b/inet.defn | 46 | +++ b/inet.defn |
| 46 | @@ -6,10 +6,10 @@ method loopback | 47 | @@ -6,10 +6,10 @@ method loopback |
| @@ -48,11 +49,11 @@ index 75e6744..b5f5da2 100644 | |||
| 48 | 49 | ||
| 49 | up | 50 | up |
| 50 | - /bin/ip link set dev %iface% up if (!iface_is_lo()) | 51 | - /bin/ip link set dev %iface% up if (!iface_is_lo()) |
| 51 | + ip link set dev %iface% up if (iface_is_lo()) | 52 | + ip link set dev %iface% up if (!iface_is_lo()) |
| 52 | 53 | ||
| 53 | down | 54 | down |
| 54 | - /bin/ip link set dev %iface% down if (!iface_is_lo()) | 55 | - /bin/ip link set dev %iface% down if (!iface_is_lo()) |
| 55 | + ip link set dev %iface% down if (iface_is_lo()) | 56 | + ip link set dev %iface% down if (!iface_is_lo()) |
| 56 | 57 | ||
| 57 | method static | 58 | method static |
| 58 | description | 59 | description |
| @@ -211,23 +212,20 @@ index 75e6744..b5f5da2 100644 | |||
| 211 | 212 | ||
| 212 | architecture kfreebsd | 213 | architecture kfreebsd |
| 213 | 214 | ||
| 214 | @@ -211,12 +211,12 @@ method loopback | 215 | @@ -211,11 +211,11 @@ method loopback |
| 215 | This method may be used to define the IPv4 loopback interface. | 216 | This method may be used to define the IPv4 loopback interface. |
| 216 | 217 | ||
| 217 | up | 218 | up |
| 218 | - /sbin/ifconfig %iface% 127.0.0.1 up \ | 219 | - /sbin/ifconfig %iface% 127.0.0.1 up \ |
| 219 | - if (!iface_is_lo()) | ||
| 220 | + ifconfig %iface% 127.0.0.1 up \ | 220 | + ifconfig %iface% 127.0.0.1 up \ |
| 221 | + if (iface_is_lo()) | 221 | if (!iface_is_lo()) |
| 222 | 222 | ||
| 223 | down | 223 | down |
| 224 | - /sbin/ifconfig %iface% down \ | 224 | - /sbin/ifconfig %iface% down \ |
| 225 | - if (!iface_is_lo()) | ||
| 226 | + ifconfig %iface% down \ | 225 | + ifconfig %iface% down \ |
| 227 | + if (iface_is_lo()) | 226 | if (!iface_is_lo()) |
| 228 | 227 | ||
| 229 | method static | 228 | method static |
| 230 | description | ||
| 231 | @@ -238,15 +238,15 @@ method static | 229 | @@ -238,15 +238,15 @@ method static |
| 232 | hwaddress cleanup_hwaddress | 230 | hwaddress cleanup_hwaddress |
| 233 | 231 | ||
| @@ -339,20 +337,6 @@ index 75e6744..b5f5da2 100644 | |||
| 339 | architecture hurd | 337 | architecture hurd |
| 340 | 338 | ||
| 341 | method loopback | 339 | method loopback |
| 342 | @@ -367,11 +367,11 @@ method loopback | ||
| 343 | |||
| 344 | up | ||
| 345 | inetutils-ifconfig --interface %iface% --address 127.0.0.1 --up \ | ||
| 346 | - if (!iface_is_lo()) | ||
| 347 | + if (iface_is_lo()) | ||
| 348 | |||
| 349 | down | ||
| 350 | inetutils-ifconfig --interface %iface% --down \ | ||
| 351 | - if (!iface_is_lo()) | ||
| 352 | + if (iface_is_lo()) | ||
| 353 | |||
| 354 | method static | ||
| 355 | description | ||
| 356 | @@ -432,23 +432,23 @@ method dhcp | 340 | @@ -432,23 +432,23 @@ method dhcp |
| 357 | 341 | ||
| 358 | up | 342 | up |
| @@ -418,5 +402,5 @@ index 75e6744..b5f5da2 100644 | |||
| 418 | - /usr/sbin/avahi-autoipd --kill %iface% | 402 | - /usr/sbin/avahi-autoipd --kill %iface% |
| 419 | + avahi-autoipd --kill %iface% | 403 | + avahi-autoipd --kill %iface% |
| 420 | -- | 404 | -- |
| 421 | 2.4.0 | 405 | 2.7.4 |
| 422 | 406 | ||
