From 3f6736001282b5d0f79d34a4c34e2790f3233c20 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Thu, 6 Jun 2013 09:52:00 +0000 Subject: [PATCH] base-files: use less entropy when generating ULAs SVN-Revision: 36865 --- package/base-files/Makefile | 2 +- .../files/etc/uci-defaults/12_network-generate-ula | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 050cc77b51..ebce5fe958 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/version.mk PKG_NAME:=base-files -PKG_RELEASE:=138 +PKG_RELEASE:=139 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_BUILD_DEPENDS:=opkg/host diff --git a/package/base-files/files/etc/uci-defaults/12_network-generate-ula b/package/base-files/files/etc/uci-defaults/12_network-generate-ula index f3e493145f..56b7eb3574 100644 --- a/package/base-files/files/etc/uci-defaults/12_network-generate-ula +++ b/package/base-files/files/etc/uci-defaults/12_network-generate-ula @@ -1,13 +1,10 @@ #!/bin/sh [ "$(uci get network.globals.ula_prefix)" != "auto" ] && exit 0 -# Sometimes results are empty, therefore try until it works... -local r1 r2 r3 -while [ -z "$r1" -o -z "$r2" -o -z "$r3" ]; do - r1=$(printf "%02x" $(($(/dev/null set network.globals.ula_prefix=fd$r1:$r2:$r3::/48