diff options
| -rw-r--r-- | meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch | 395 | ||||
| -rw-r--r-- | meta/recipes-core/ifupdown/ifupdown_0.8.16.bb (renamed from meta/recipes-core/ifupdown/ifupdown_0.8.2.bb) | 4 |
2 files changed, 359 insertions, 40 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 bff352e3af..2013933b69 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 74152ac74a3e1ea0f3be292aa1eeca5ad1fe69c0 Mon Sep 17 00:00:00 2001 | 1 | From d88af5aa0312ea18aac791d66661da79b7bcd032 Mon Sep 17 00:00:00 2001 |
| 2 | From: Paul Gortmaker <paul.gortmaker@windriver.com> | 2 | From: "Maxin B. John" <maxin.john@intel.com> |
| 3 | Date: Wed, 6 Aug 2014 15:12:11 -0400 | 3 | Date: Wed, 21 Dec 2016 15:32:07 +0200 |
| 4 | Subject: [PATCH 2/2] inet[6].defn: fix inverted checks for loopback | 4 | Subject: [PATCH] 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 |
| @@ -11,60 +11,335 @@ The result was that we'd update /run/network/ifstate for "lo" | |||
| 11 | but never actually do anything for up/down, as shown below: | 11 | but never actually do anything for up/down, as shown below: |
| 12 | 12 | ||
| 13 | root@localhost:~# ifconfig -s | 13 | root@localhost:~# ifconfig -s |
| 14 | Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg | 14 | Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg |
| 15 | eth0 1500 0 7736329 0 2016 0 5289422 0 0 0 BMRU | 15 | eth0 1500 0 7736329 0 2016 0 5289422 0 0 0 BMRU |
| 16 | lo 65536 0 18 0 0 0 18 0 0 0 LRU | 16 | lo 65536 0 18 0 0 0 18 0 0 0 LRU |
| 17 | root@localhost:~# ifdown lo | 17 | root@localhost:~# ifdown lo |
| 18 | root@localhost:~# echo $? | 18 | root@localhost:~# echo $? |
| 19 | 0 | 19 | 0 |
| 20 | root@localhost:~# ifconfig -s | 20 | root@localhost:~# ifconfig -s |
| 21 | Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg | 21 | Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg |
| 22 | eth0 1500 0 7736406 0 2016 0 5289455 0 0 0 BMRU | 22 | eth0 1500 0 7736406 0 2016 0 5289455 0 0 0 BMRU |
| 23 | lo 65536 0 18 0 0 0 18 0 0 0 LRU | 23 | lo 65536 0 18 0 0 0 18 0 0 0 LRU |
| 24 | root@localhost:~# ifconfig lo down | 24 | root@localhost:~# ifconfig lo down |
| 25 | root@localhost:~# ifconfig -s | 25 | root@localhost:~# ifconfig -s |
| 26 | Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg | 26 | Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg |
| 27 | eth0 1500 0 7736474 0 2016 0 5289481 0 0 0 BMRU | 27 | eth0 1500 0 7736474 0 2016 0 5289481 0 0 0 BMRU |
| 28 | root@localhost:~# | 28 | root@localhost:~# |
| 29 | 29 | ||
| 30 | Also reverted the commit: | ||
| 31 | commit 80b878497663dae08f70b4d3cffe127b57a3cfc | ||
| 32 | which uses absolute paths to binaries called by ifup/ifdown. | ||
| 33 | |||
| 34 | Upstream-Status: Inappropriate [OE specific] | ||
| 35 | |||
| 30 | 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> | ||
| 31 | --- | 38 | --- |
| 32 | inet.defn | 12 ++++++------ | 39 | inet.defn | 148 +++++++++++++++++++++++++++++++------------------------------- |
| 33 | inet6.defn | 8 ++++---- | 40 | 1 file changed, 74 insertions(+), 74 deletions(-) |
| 34 | 2 files changed, 10 insertions(+), 10 deletions(-) | ||
| 35 | 41 | ||
| 36 | diff --git a/inet.defn b/inet.defn | 42 | diff --git a/inet.defn b/inet.defn |
| 37 | index b176ab4ed03e..5fdfb14a0e1c 100644 | 43 | index 75e6744..b5f5da2 100644 |
| 38 | --- a/inet.defn | 44 | --- a/inet.defn |
| 39 | +++ b/inet.defn | 45 | +++ b/inet.defn |
| 40 | @@ -6,10 +6,10 @@ method loopback | 46 | @@ -6,10 +6,10 @@ method loopback |
| 41 | This method may be used to define the IPv4 loopback interface. | 47 | This method may be used to define the IPv4 loopback interface. |
| 42 | 48 | ||
| 43 | up | 49 | up |
| 44 | - ip link set dev %iface% up if (!iface_is_lo()) | 50 | - /bin/ip link set dev %iface% up if (!iface_is_lo()) |
| 45 | + ip link set dev %iface% up if (iface_is_lo()) | 51 | + ip link set dev %iface% up if (iface_is_lo()) |
| 46 | 52 | ||
| 47 | down | 53 | down |
| 48 | - ip link set dev %iface% down if (!iface_is_lo()) | 54 | - /bin/ip link set dev %iface% down if (!iface_is_lo()) |
| 49 | + ip link set dev %iface% down if (iface_is_lo()) | 55 | + ip link set dev %iface% down if (iface_is_lo()) |
| 50 | 56 | ||
| 51 | method static | 57 | method static |
| 52 | description | 58 | description |
| 53 | @@ -212,11 +212,11 @@ method loopback | 59 | @@ -36,17 +36,17 @@ method static |
| 60 | broadcast compute_v4_broadcast | ||
| 61 | |||
| 62 | up | ||
| 63 | - /bin/ip addr add %address%[[/%netmask%]] [[broadcast %broadcast%]] \ | ||
| 64 | + ip addr add %address%[[/%netmask%]] [[broadcast %broadcast%]] \ | ||
| 65 | [[peer %pointopoint%]] [[scope %scope%]] dev %iface% label %iface% | ||
| 66 | - /bin/ip link set dev %iface% [[mtu %mtu%]] [[address %hwaddress%]] up | ||
| 67 | + ip link set dev %iface% [[mtu %mtu%]] [[address %hwaddress%]] up | ||
| 68 | |||
| 69 | - [[ /bin/ip route add default via %gateway% [[metric %metric%]] dev %iface% onlink ]] | ||
| 70 | + [[ ip route add default via %gateway% [[metric %metric%]] dev %iface% onlink ]] | ||
| 71 | |||
| 72 | down | ||
| 73 | - [[ /bin/ip route del default via %gateway% [[metric %metric%]] dev %iface% 2>&1 1>/dev/null || true ]] | ||
| 74 | - /bin/ip addr del %address%[[/%netmask%]] [[broadcast %broadcast%]] \ | ||
| 75 | + [[ ip route del default via %gateway% [[metric %metric%]] dev %iface% 2>&1 1>/dev/null || true ]] | ||
| 76 | + ip addr del %address%[[/%netmask%]] [[broadcast %broadcast%]] \ | ||
| 77 | [[peer %pointopoint%]] [[scope %scope%]] dev %iface% label %iface% | ||
| 78 | - /bin/ip link set dev %iface% down \ | ||
| 79 | + ip link set dev %iface% down \ | ||
| 80 | if (iface_is_link()) | ||
| 81 | |||
| 82 | method manual | ||
| 83 | @@ -63,12 +63,12 @@ method manual | ||
| 84 | hwaddress cleanup_hwaddress | ||
| 85 | |||
| 86 | up | ||
| 87 | - [[/bin/ip link set dev %iface% mtu %mtu%]] | ||
| 88 | - [[/bin/ip link set dev %iface% address %hwaddress%]] | ||
| 89 | - /bin/ip link set dev %iface% up 2>/dev/null || true | ||
| 90 | + [[ip link set dev %iface% mtu %mtu%]] | ||
| 91 | + [[ip link set dev %iface% address %hwaddress%]] | ||
| 92 | + ip link set dev %iface% up 2>/dev/null || true | ||
| 93 | |||
| 94 | down | ||
| 95 | - /bin/ip link set dev %iface% down 2>/dev/null || true \ | ||
| 96 | + ip link set dev %iface% down 2>/dev/null || true \ | ||
| 97 | if (iface_is_link() && !do_all) | ||
| 98 | |||
| 99 | method dhcp | ||
| 100 | @@ -93,33 +93,33 @@ method dhcp | ||
| 101 | hwaddress cleanup_hwaddress | ||
| 102 | |||
| 103 | up | ||
| 104 | - [[/bin/ip link set dev %iface% address %hwaddress%]] | ||
| 105 | - /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 | + [[ip link set dev %iface% address %hwaddress%]] | ||
| 107 | + dhclient -v -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \ | ||
| 108 | [[-e IF_METRIC=%metric%]] \ | ||
| 109 | if (execable("/sbin/dhclient")) | ||
| 110 | - /sbin/pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \ | ||
| 111 | + pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \ | ||
| 112 | elsif (execable("/sbin/pump")) | ||
| 113 | - /sbin/udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-x hostname:%hostname%]] \ | ||
| 114 | + udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-x hostname:%hostname%]] \ | ||
| 115 | elsif (execable("/sbin/udhcpc")) | ||
| 116 | - /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \ | ||
| 117 | + dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \ | ||
| 118 | [[-l %leasetime%]] [[-m %metric%]] %iface% \ | ||
| 119 | elsif (execable("/sbin/dhcpcd")) | ||
| 120 | echo 'No DHCP client software found!' >/dev/stderr; false \ | ||
| 121 | elsif (1) | ||
| 122 | |||
| 123 | down | ||
| 124 | - /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 | + 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 | if (execable("/sbin/dhclient")) | ||
| 127 | - /sbin/pump -i %iface% -r \ | ||
| 128 | + pump -i %iface% -r \ | ||
| 129 | elsif (execable("/sbin/pump")) | ||
| 130 | - 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 $(cat /run/udhcpc.%iface%.pid); kill -TERM $(cat /run/udhcpc.%iface%.pid); fi \ | ||
| 132 | elsif (execable("/sbin/udhcpc")) | ||
| 133 | - /sbin/dhcpcd -k %iface% \ | ||
| 134 | + dhcpcd -k %iface% \ | ||
| 135 | elsif (execable("/sbin/dhcpcd")) | ||
| 136 | echo 'No DHCP client software found!' >/dev/stderr; false \ | ||
| 137 | elsif (1) | ||
| 138 | |||
| 139 | - /bin/ip link set dev %iface% down \ | ||
| 140 | + ip link set dev %iface% down \ | ||
| 141 | if (iface_is_link()) | ||
| 142 | |||
| 143 | method bootp | ||
| 144 | @@ -134,11 +134,11 @@ method bootp | ||
| 145 | whatever it really is. | ||
| 146 | |||
| 147 | up | ||
| 148 | - /sbin/bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server %server%]] \ | ||
| 149 | + bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server %server%]] \ | ||
| 150 | [[--hwaddr %hwaddr%]] --returniffail --serverbcast | ||
| 151 | |||
| 152 | down | ||
| 153 | - /bin/ip link set dev %iface% down \ | ||
| 154 | + ip link set dev %iface% down \ | ||
| 155 | if (iface_is_link()) | ||
| 156 | |||
| 157 | method tunnel | ||
| 158 | @@ -158,13 +158,13 @@ method tunnel | ||
| 159 | ttl time -- TTL setting | ||
| 160 | mtu size -- MTU size | ||
| 161 | up | ||
| 162 | - /bin/ip tunnel add %iface% mode %mode% remote %endpoint% [[local %local%]] \ | ||
| 163 | + ip tunnel add %iface% mode %mode% remote %endpoint% [[local %local%]] \ | ||
| 164 | [[ttl %ttl%]] | ||
| 165 | - /bin/ip link set %iface% up [[mtu %mtu%]] | ||
| 166 | - /bin/ip addr add %address%/%netmask% dev %iface% [[peer %dstaddr%]] | ||
| 167 | - [[ /bin/ip route add default via %gateway% [[metric %metric%]] dev %iface% onlink ]] | ||
| 168 | + ip link set %iface% up [[mtu %mtu%]] | ||
| 169 | + ip addr add %address%/%netmask% dev %iface% [[peer %dstaddr%]] | ||
| 170 | + [[ ip route add default via %gateway% [[metric %metric%]] dev %iface% onlink ]] | ||
| 171 | down | ||
| 172 | - /bin/ip tunnel del %iface% | ||
| 173 | + ip tunnel del %iface% | ||
| 174 | |||
| 175 | method ppp | ||
| 176 | description | ||
| 177 | @@ -175,9 +175,9 @@ method ppp | ||
| 178 | unit number -- Use /number/ as the ppp unit number. | ||
| 179 | options string -- Pass /string/ as additional options to pon. | ||
| 180 | up | ||
| 181 | - /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]] | ||
| 182 | + pon [[%provider%]] [[unit %unit%]] [[%options%]] | ||
| 183 | down | ||
| 184 | - /usr/bin/poff [[%provider%]] | ||
| 185 | + poff [[%provider%]] | ||
| 186 | |||
| 187 | method wvdial | ||
| 188 | description | ||
| 189 | @@ -186,10 +186,10 @@ method wvdial | ||
| 190 | options | ||
| 191 | provider name -- Use /name/ as the provider (from /etc/wvdial.conf). | ||
| 192 | up | ||
| 193 | - /sbin/start-stop-daemon --start -x /usr/bin/wvdial \ | ||
| 194 | + start-stop-daemon --start -x /usr/bin/wvdial \ | ||
| 195 | -p /run/wvdial.%iface%.pid -b -m -- [[ %provider% ]] | ||
| 196 | down | ||
| 197 | - /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \ | ||
| 198 | + start-stop-daemon --stop -x /usr/bin/wvdial \ | ||
| 199 | -p /run/wvdial.%iface%.pid -s 2 | ||
| 200 | |||
| 201 | |||
| 202 | @@ -200,9 +200,9 @@ method ipv4ll | ||
| 203 | known as APIPA or IPAC, and often colloquially referred to | ||
| 204 | as "Zeroconf address". | ||
| 205 | up | ||
| 206 | - /usr/sbin/avahi-autoipd -D %iface% | ||
| 207 | + avahi-autoipd -D %iface% | ||
| 208 | down | ||
| 209 | - /usr/sbin/avahi-autoipd --kill %iface% | ||
| 210 | + avahi-autoipd --kill %iface% | ||
| 211 | |||
| 212 | architecture kfreebsd | ||
| 213 | |||
| 214 | @@ -211,12 +211,12 @@ method loopback | ||
| 215 | This method may be used to define the IPv4 loopback interface. | ||
| 54 | 216 | ||
| 55 | up | 217 | up |
| 56 | ifconfig %iface% 127.0.0.1 up \ | 218 | - /sbin/ifconfig %iface% 127.0.0.1 up \ |
| 57 | - if (!iface_is_lo()) | 219 | - if (!iface_is_lo()) |
| 220 | + ifconfig %iface% 127.0.0.1 up \ | ||
| 58 | + if (iface_is_lo()) | 221 | + if (iface_is_lo()) |
| 59 | 222 | ||
| 60 | down | 223 | down |
| 61 | ifconfig %iface% down \ | 224 | - /sbin/ifconfig %iface% down \ |
| 62 | - if (!iface_is_lo()) | 225 | - if (!iface_is_lo()) |
| 226 | + ifconfig %iface% down \ | ||
| 63 | + if (iface_is_lo()) | 227 | + if (iface_is_lo()) |
| 64 | 228 | ||
| 65 | method static | 229 | method static |
| 66 | description | 230 | description |
| 67 | @@ -371,11 +371,11 @@ method loopback | 231 | @@ -238,15 +238,15 @@ method static |
| 232 | hwaddress cleanup_hwaddress | ||
| 233 | |||
| 234 | up | ||
| 235 | - [[ /sbin/ifconfig %iface% link %hwaddress%]] | ||
| 236 | - /sbin/ifconfig %iface% %address% [[netmask %netmask%]] [[broadcast %broadcast%]] \ | ||
| 237 | + [[ ifconfig %iface% link %hwaddress%]] | ||
| 238 | + ifconfig %iface% %address% [[netmask %netmask%]] [[broadcast %broadcast%]] \ | ||
| 239 | [[pointopoint %pointopoint%]] [[media %media%]] [[mtu %mtu%]] \ | ||
| 240 | up | ||
| 241 | - [[ /sbin/route add default %gateway% ]] | ||
| 242 | + [[ route add default %gateway% ]] | ||
| 243 | |||
| 244 | down | ||
| 245 | - [[ /sbin/route del default %gateway% 2>&1 1>/dev/null || true ]] | ||
| 246 | - /sbin/ifconfig %iface% down | ||
| 247 | + [[ route del default %gateway% 2>&1 1>/dev/null || true ]] | ||
| 248 | + ifconfig %iface% down | ||
| 249 | |||
| 250 | method manual | ||
| 251 | description | ||
| 252 | @@ -279,30 +279,30 @@ method dhcp | ||
| 253 | hwaddress cleanup_hwaddress | ||
| 254 | |||
| 255 | up | ||
| 256 | - [[/sbin/ifconfig %iface% link %hwaddress%]] | ||
| 257 | - /sbin/dhclient -v -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \ | ||
| 258 | + [[ifconfig %iface% link %hwaddress%]] | ||
| 259 | + dhclient -v -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \ | ||
| 260 | [[-e IF_METRIC=%metric%]] \ | ||
| 261 | if (execable("/sbin/dhclient")) | ||
| 262 | - /sbin/udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-H %hostname%]] \ | ||
| 263 | + udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-H %hostname%]] \ | ||
| 264 | [[-c %client%]] \ | ||
| 265 | elsif (execable("/sbin/udhcpc")) | ||
| 266 | - /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \ | ||
| 267 | + dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \ | ||
| 268 | [[-l %leasetime%]] %iface% \ | ||
| 269 | elsif (execable("/sbin/dhcpcd")) | ||
| 270 | echo 'No DHCP client software found!' >/dev/stderr; false \ | ||
| 271 | elsif (1) | ||
| 272 | |||
| 273 | down | ||
| 274 | - /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% \ | ||
| 275 | + dhclient -v -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \ | ||
| 276 | if (execable("/sbin/dhclient")) | ||
| 277 | - 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 \ | ||
| 278 | + if test -f /run/udhcpc.%iface%.pid; then kill -USR2 $(cat /run/udhcpc.%iface%.pid); kill -TERM $(cat /run/udhcpc.%iface%.pid); fi \ | ||
| 279 | elsif (execable("/sbin/udhcpc")) | ||
| 280 | - /sbin/dhcpcd -k %iface% \ | ||
| 281 | + dhcpcd -k %iface% \ | ||
| 282 | elsif (execable("/sbin/dhcpcd")) | ||
| 283 | echo 'No DHCP client software found!' >/dev/stderr; false \ | ||
| 284 | elsif (1) | ||
| 285 | |||
| 286 | - /sbin/ifconfig %iface% down | ||
| 287 | + ifconfig %iface% down | ||
| 288 | |||
| 289 | method bootp | ||
| 290 | description | ||
| 291 | @@ -316,11 +316,11 @@ method bootp | ||
| 292 | whatever it really is. | ||
| 293 | |||
| 294 | up | ||
| 295 | - /sbin/bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server %server%]] \ | ||
| 296 | + bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server %server%]] \ | ||
| 297 | [[--hwaddr %hwaddr%]] --returniffail --serverbcast | ||
| 298 | |||
| 299 | down | ||
| 300 | - /sbin/ifconfig %iface% down | ||
| 301 | + ifconfig %iface% down | ||
| 302 | |||
| 303 | method ppp | ||
| 304 | description | ||
| 305 | @@ -331,9 +331,9 @@ method ppp | ||
| 306 | unit number -- Use /number/ as the ppp unit number. | ||
| 307 | options string -- Pass /string/ as additional options to pon. | ||
| 308 | up | ||
| 309 | - /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]] | ||
| 310 | + pon [[%provider%]] [[unit %unit%]] [[%options%]] | ||
| 311 | down | ||
| 312 | - /usr/bin/poff [[%provider%]] | ||
| 313 | + poff [[%provider%]] | ||
| 314 | |||
| 315 | method wvdial | ||
| 316 | description | ||
| 317 | @@ -342,10 +342,10 @@ method wvdial | ||
| 318 | options | ||
| 319 | provider name -- Use /name/ as the provider (from /etc/wvdial.conf). | ||
| 320 | up | ||
| 321 | - /sbin/start-stop-daemon --start -x /usr/bin/wvdial \ | ||
| 322 | + start-stop-daemon --start -x /usr/bin/wvdial \ | ||
| 323 | -p /run/wvdial.%iface%.pid -b -m -- [[ %provider% ]] | ||
| 324 | down | ||
| 325 | - /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \ | ||
| 326 | + start-stop-daemon --stop -x /usr/bin/wvdial \ | ||
| 327 | -p /run/wvdial.%iface%.pid -s 2 | ||
| 328 | |||
| 329 | |||
| 330 | @@ -356,9 +356,9 @@ method ipv4ll | ||
| 331 | known as APIPA or IPAC, and often colloquially referred to | ||
| 332 | as "Zeroconf address". | ||
| 333 | up | ||
| 334 | - /usr/sbin/avahi-autoipd -D %iface% | ||
| 335 | + avahi-autoipd -D %iface% | ||
| 336 | down | ||
| 337 | - /usr/sbin/avahi-autoipd --kill %iface% | ||
| 338 | + avahi-autoipd --kill %iface% | ||
| 339 | architecture hurd | ||
| 340 | |||
| 341 | method loopback | ||
| 342 | @@ -367,11 +367,11 @@ method loopback | ||
| 68 | 343 | ||
| 69 | up | 344 | up |
| 70 | inetutils-ifconfig --interface %iface% --address 127.0.0.1 --up \ | 345 | inetutils-ifconfig --interface %iface% --address 127.0.0.1 --up \ |
| @@ -78,26 +353,70 @@ index b176ab4ed03e..5fdfb14a0e1c 100644 | |||
| 78 | 353 | ||
| 79 | method static | 354 | method static |
| 80 | description | 355 | description |
| 81 | diff --git a/inet6.defn b/inet6.defn | 356 | @@ -432,23 +432,23 @@ method dhcp |
| 82 | index 09325539cd01..4df64aff38cc 100644 | 357 | |
| 83 | --- a/inet6.defn | ||
| 84 | +++ b/inet6.defn | ||
| 85 | @@ -33,11 +33,11 @@ method loopback | ||
| 86 | description | ||
| 87 | This method may be used to define the IPv6 loopback interface. | ||
| 88 | up | 358 | up |
| 89 | - -ip link set dev %iface% up 2>/dev/null if (!iface_is_lo()) | 359 | [[Warning: Option hwaddress: %hwaddress% not yet supported]] |
| 90 | - -ip addr add dev %iface% ::1 2>/dev/null if (!iface_is_lo()) | 360 | - /sbin/dhclient -v -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \ |
| 91 | + -ip link set dev %iface% up 2>/dev/null if (iface_is_lo()) | 361 | + dhclient -v -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \ |
| 92 | + -ip addr add dev %iface% ::1 2>/dev/null if (iface_is_lo()) | 362 | if (execable("/sbin/dhclient")) |
| 363 | - /sbin/udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface% [[-H %hostname%]] \ | ||
| 364 | + udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface% [[-H %hostname%]] \ | ||
| 365 | [[-c %client%]] \ | ||
| 366 | elsif (execable("/sbin/udhcpc")) | ||
| 367 | - /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \ | ||
| 368 | + dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \ | ||
| 369 | [[-l %leasetime%]] %iface% \ | ||
| 370 | elsif (execable("/sbin/dhcpcd")) | ||
| 371 | echo 'No DHCP client software found!' >/dev/stderr; false \ | ||
| 372 | elsif (1) | ||
| 373 | |||
| 374 | down | ||
| 375 | - /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% \ | ||
| 376 | + dhclient -v -r -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \ | ||
| 377 | if (execable("/sbin/dhclient")) | ||
| 378 | - 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 \ | ||
| 379 | + if test -f /run/udhcpc.%iface///.%.pid; then kill -USR2 $(cat /run/udhcpc.%iface///.%.pid); kill -TERM $(cat /run/udhcpc.%iface///.%.pid); fi \ | ||
| 380 | elsif (execable("/sbin/udhcpc")) | ||
| 381 | - /sbin/dhcpcd -k %iface% \ | ||
| 382 | + dhcpcd -k %iface% \ | ||
| 383 | elsif (execable("/sbin/dhcpcd")) | ||
| 384 | echo 'No DHCP client software found!' >/dev/stderr; false \ | ||
| 385 | elsif (1) | ||
| 386 | @@ -482,9 +482,9 @@ method ppp | ||
| 387 | unit number -- Use /number/ as the ppp unit number. | ||
| 388 | options string -- Pass /string/ as additional options to pon. | ||
| 389 | up | ||
| 390 | - /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]] | ||
| 391 | + pon [[%provider%]] [[unit %unit%]] [[%options%]] | ||
| 93 | down | 392 | down |
| 94 | - -ip addr del dev %iface% ::1 2>/dev/null if (!iface_is_lo()) | 393 | - /usr/bin/poff [[%provider%]] |
| 95 | - -ip link set dev %iface% down 2>/dev/null if (!iface_is_lo()) | 394 | + poff [[%provider%]] |
| 96 | + -ip addr del dev %iface% ::1 2>/dev/null if (iface_is_lo()) | ||
| 97 | + -ip link set dev %iface% down 2>/dev/null if (iface_is_lo()) | ||
| 98 | 395 | ||
| 99 | method static | 396 | method wvdial |
| 100 | description | 397 | description |
| 398 | @@ -493,10 +493,10 @@ method wvdial | ||
| 399 | options | ||
| 400 | provider name -- Use /name/ as the provider (from /etc/wvdial.conf). | ||
| 401 | up | ||
| 402 | - /sbin/start-stop-daemon --start -x /usr/bin/wvdial \ | ||
| 403 | + start-stop-daemon --start -x /usr/bin/wvdial \ | ||
| 404 | -p /run/wvdial.%iface///.%.pid -b -m -- [[ %provider% ]] | ||
| 405 | down | ||
| 406 | - /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \ | ||
| 407 | + start-stop-daemon --stop -x /usr/bin/wvdial \ | ||
| 408 | -p /run/wvdial.%iface///.%.pid -s 2 | ||
| 409 | |||
| 410 | |||
| 411 | @@ -507,6 +507,6 @@ method ipv4ll | ||
| 412 | known as APIPA or IPAC, and often colloquially referred to | ||
| 413 | as "Zeroconf address". | ||
| 414 | up | ||
| 415 | - /usr/sbin/avahi-autoipd -D %iface% | ||
| 416 | + avahi-autoipd -D %iface% | ||
| 417 | down | ||
| 418 | - /usr/sbin/avahi-autoipd --kill %iface% | ||
| 419 | + avahi-autoipd --kill %iface% | ||
| 101 | -- | 420 | -- |
| 102 | 1.9.1 | 421 | 2.4.0 |
| 103 | 422 | ||
diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.2.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.16.bb index 9de01f9617..eb8426cb97 100644 --- a/meta/recipes-core/ifupdown/ifupdown_0.8.2.bb +++ b/meta/recipes-core/ifupdown/ifupdown_0.8.16.bb | |||
| @@ -6,12 +6,12 @@ the file /etc/network/interfaces." | |||
| 6 | LICENSE = "GPLv2" | 6 | LICENSE = "GPLv2" |
| 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
| 8 | 8 | ||
| 9 | SRC_URI = "git://anonscm.debian.org/git/collab-maint/ifupdown.git;protocol=https \ | 9 | SRC_URI = "git://anonscm.debian.org/git/collab-maint/ifupdown.git \ |
| 10 | file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \ | 10 | file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \ |
| 11 | file://inet-6-.defn-fix-inverted-checks-for-loopback.patch \ | 11 | file://inet-6-.defn-fix-inverted-checks-for-loopback.patch \ |
| 12 | file://99_network \ | 12 | file://99_network \ |
| 13 | " | 13 | " |
| 14 | SRCREV = "05ea2fd4f49bb1201aeef2a42efbcff8f336112f" | 14 | SRCREV = "11b9f99f7ecc7052497e6786156cfed531f11823" |
| 15 | 15 | ||
| 16 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
| 17 | 17 | ||
