BB: base-files: /lib/functions/network.sh: fix network_get_ipaddr6

When looking for the first ipaddr also consider the current prefix just
like network_get_ipaddrs6 does. If ipv6-address was empty the function
did not return the first ipaddr even if the list was non-empty.

fixes commit 83e9122f88a002871d5cdf421cf6aa6052b7e006

Signed-off-by: Henning Schild <henning@hennsch.de>
Backport of r42139

SVN-Revision: 42140

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 76a4dabe0ed047d71e3fcd7acb8e6c3d270701c8..033eef01ecc9c99a78c91c6b56f21a936033948a 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/version.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=155
+PKG_RELEASE:=156
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host

diff --git a/package/base-files/files/lib/functions/network.sh b/package/base-files/files/lib/functions/network.sh
index 86ab8905f1477f1e2ef5655dba75f5c345980a70..f4cf2b53447148f169179b6a1df3c9f971cddb67 100644 (file)
--- a/package/base-files/files/lib/functions/network.sh
+++ b/package/base-files/files/lib/functions/network.sh
@@ -29,7 +29,18 @@ network_get_ipaddr() {
 # 1: destination variable
 # 2: interface
 network_get_ipaddr6() {
-       __network_ifstatus "$1" "$2" "['ipv6-address'][0].address";
+       local __addr
+
+       if __network_ifstatus "__addr" "$2" "['ipv6-address','ipv6-prefix-assignment'][0].address"; then
+               case "$__addr" in
+                       *:)     export "$1=${__addr}1" ;;
+                       *)      export "$1=${__addr}" ;;
+               esac
+               return 0
+       fi
+
+       unset $1
+       return 1
 }
 
 # determine first IPv4 subnet of given logical interface