diff options
author | Zach van Rijn <me@zv.io> | 2021-10-07 17:31:10 +0000 |
---|---|---|
committer | Zach van Rijn <me@zv.io> | 2021-10-07 17:31:10 +0000 |
commit | b53c023d3847f417ba79fc207de35b23d50dd7b0 (patch) | |
tree | 09475576abd09bc9a9f9c0ed6c2787aeb31ec27b /legacy/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch | |
parent | 461d0effc689a5b2e564b0ed1e47e268264de65c (diff) | |
parent | ff476413e30a6cf477364eeed12ed06540a8b436 (diff) | |
download | packages-b53c023d3847f417ba79fc207de35b23d50dd7b0.tar.gz packages-b53c023d3847f417ba79fc207de35b23d50dd7b0.tar.bz2 packages-b53c023d3847f417ba79fc207de35b23d50dd7b0.tar.xz packages-b53c023d3847f417ba79fc207de35b23d50dd7b0.zip |
Merge branch '20211005-zv-remove-legacy' into 'master'
legacy/*: cleanup packages that can 'definitely go'
See merge request adelie/packages!625
Diffstat (limited to 'legacy/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch')
-rw-r--r-- | legacy/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/legacy/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch b/legacy/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch deleted file mode 100644 index bdf24b783..000000000 --- a/legacy/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 444a2f6be54186ae9ade1f2c3d4356cd62a720c5 Mon Sep 17 00:00:00 2001 -From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> -Date: Fri, 23 Mar 2018 14:56:52 +0200 -Subject: [PATCH] ifupdown: do not fail if interface disappears during ifdown - -Interface may not exist because it got deleted by an ifdown hook script -earlier. This may happen when a virtual interface, such as VLAN, has multiple -iface blocks defined. - -Signed-off-by: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> ---- - networking/ifupdown.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/networking/ifupdown.c b/networking/ifupdown.c -index 534c9f0c7..35d13c5e1 100644 ---- a/networking/ifupdown.c -+++ b/networking/ifupdown.c -@@ -141,6 +141,7 @@ - #include "libbb.h" - #include "common_bufsiz.h" - /* After libbb.h, since it needs sys/types.h on some systems */ -+#include <net/if.h> - #include <sys/utsname.h> - #include <fnmatch.h> - -@@ -503,6 +504,7 @@ static int FAST_FUNC static_up6(struct interface_defn_t *ifd, execfn *exec) - - static int FAST_FUNC static_down6(struct interface_defn_t *ifd, execfn *exec) - { -+ if (!if_nametoindex(ifd->iface)) return 1; - # if ENABLE_FEATURE_IFUPDOWN_IP - return execute("ip link set %iface% down", ifd, exec); - # else -@@ -598,6 +600,7 @@ static int FAST_FUNC static_up(struct interface_defn_t *ifd, execfn *exec) - static int FAST_FUNC static_down(struct interface_defn_t *ifd, execfn *exec) - { - int result; -+ if (!if_nametoindex(ifd->iface)) return 2; - # if ENABLE_FEATURE_IFUPDOWN_IP - /* Optional "label LBL" is necessary if interface is an alias (eth0:0), - * otherwise "ip addr flush dev eth0:0" flushes all addresses on eth0. --- -2.14.3 - |