| Message ID | 1521474554-39433-1-git-send-email-freifunk@adrianschmutzler.de |
|---|---|
| State | Superseded |
| Headers | show |
diff --git a/build_patches/routing/0001-alfred-Support-interface-IDs-with-more-than-two-digi.patch b/build_patches/routing/0001-alfred-Support-interface-IDs-with-more-than-two-digi.patch new file mode 100644 index 0000000..ce68d2f --- /dev/null +++ b/build_patches/routing/0001-alfred-Support-interface-IDs-with-more-than-two-digi.patch @@ -0,0 +1,26 @@ +From b6da43f0f7ef835c994e20d20a42507606505f30 Mon Sep 17 00:00:00 2001 +From: Adrian Schmutzler <freifunk@adrianschmutzler.de> +Date: Mon, 19 Mar 2018 14:16:54 +0100 +Subject: [PATCH] alfred: Support interface IDs with more than two digits + +Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> +--- + alfred/files/alfred.init | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/alfred/files/alfred.init b/alfred/files/alfred.init +index 4c9a9e1..3b5fb3d 100755 +--- a/alfred/files/alfred.init ++++ b/alfred/files/alfred.init +@@ -50,7 +50,7 @@ wait_for_ll_address() + # - on interface $iface + if awk ' + BEGIN { RET=1 } +- /^fe80.{37} [012389ab]/ { if ($6 == "'"$iface"'") RET=0 } ++ /^fe80.{37}[0-9a-f]? [012389ab]/ { if ($6 == "'"$iface"'") RET=0 } + END { exit RET } + ' /proc/net/if_inet6; then + return +-- +2.7.4 + diff --git a/buildscript b/buildscript index 7abab0e..9c3cbb0 100755 --- a/buildscript +++ b/buildscript @@ -38,7 +38,8 @@ GLUON_PKGS="kmod-batman-adv-legacy micrond simple-tc uradvd" #official openwrt routing packages ROUTING=(routing https://git.openwrt.org/feed/routing.git - d11075cd40a88602bf4ba2b275f72100ddcb4767) # lede-17.01 + d11075cd40a88602bf4ba2b275f72100ddcb4767 + "0001-alfred-Support-interface-IDs-with-more-than-two-digi.patch") # lede-17.01 ROUTING_PKGS="kmod-batman-adv batctl alfred" FFF=(fff)
Hi Adrian,
da der Interface Index tatsächlich auch mal 3stellig sein kann, ist der
Patch notwendig.
Ich persönlich fände /^fe80.{37,38} [012389ab]/ schöner, ist aber egal.
Reviewed-by: Robert Langhgammer <rlanghammer@web.de>
Am 19.03.2018 um 16:49 schrieb Adrian Schmutzler:
> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
>
> Tested-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> ---
> ...ort-interface-IDs-with-more-than-two-digi.patch | 26 ++++++++++++++++++++++
> buildscript | 3 ++-
> 2 files changed, 28 insertions(+), 1 deletion(-)
> create mode 100644 build_patches/routing/0001-alfred-Support-interface-IDs-with-more-than-two-digi.patch
>
> diff --git a/build_patches/routing/0001-alfred-Support-interface-IDs-with-more-than-two-digi.patch b/build_patches/routing/0001-alfred-Support-interface-IDs-with-more-than-two-digi.patch
> new file mode 100644
> index 0000000..ce68d2f
> --- /dev/null
> +++ b/build_patches/routing/0001-alfred-Support-interface-IDs-with-more-than-two-digi.patch
> @@ -0,0 +1,26 @@
> +From b6da43f0f7ef835c994e20d20a42507606505f30 Mon Sep 17 00:00:00 2001
> +From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> +Date: Mon, 19 Mar 2018 14:16:54 +0100
> +Subject: [PATCH] alfred: Support interface IDs with more than two digits
> +
> +Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> +---
> + alfred/files/alfred.init | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/alfred/files/alfred.init b/alfred/files/alfred.init
> +index 4c9a9e1..3b5fb3d 100755
> +--- a/alfred/files/alfred.init
> ++++ b/alfred/files/alfred.init
> +@@ -50,7 +50,7 @@ wait_for_ll_address()
> + # - on interface $iface
> + if awk '
> + BEGIN { RET=1 }
> +- /^fe80.{37} [012389ab]/ { if ($6 == "'"$iface"'") RET=0 }
> ++ /^fe80.{37}[0-9a-f]? [012389ab]/ { if ($6 == "'"$iface"'") RET=0 }
> + END { exit RET }
> + ' /proc/net/if_inet6; then
> + return
> +--
> +2.7.4
> +
> diff --git a/buildscript b/buildscript
> index 7abab0e..9c3cbb0 100755
> --- a/buildscript
> +++ b/buildscript
> @@ -38,7 +38,8 @@ GLUON_PKGS="kmod-batman-adv-legacy micrond simple-tc uradvd"
> #official openwrt routing packages
> ROUTING=(routing
> https://git.openwrt.org/feed/routing.git
> - d11075cd40a88602bf4ba2b275f72100ddcb4767) # lede-17.01
> + d11075cd40a88602bf4ba2b275f72100ddcb4767
> + "0001-alfred-Support-interface-IDs-with-more-than-two-digi.patch") # lede-17.01
> ROUTING_PKGS="kmod-batman-adv batctl alfred"
>
> FFF=(fff)