From d83e5f62ca54d74b66ce862ae713e18fd26d1d7e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 2 Feb 2015 15:36:26 +0100 Subject: allow passwords with # --- package/base-files/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'package/base-files') diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 0e3c27b3e..827007550 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.1 -PKG_RELEASE:= 9 +PKG_RELEASE:= 10 PKG_SECTION:= base/apps PKG_DESCR:= basic files and scripts @@ -95,9 +95,10 @@ endif echo "ff02::1 ip6-allnodes" >> $(IDIR_BASE_FILES)/etc/hosts echo "ff02::2 ip6-allrouters" >> $(IDIR_BASE_FILES)/etc/hosts echo "ff02::3 ip6-allhosts" >> $(IDIR_BASE_FILES)/etc/hosts - test -z $(ADK_RUNTIME_PASSWORD) || \ + test -z '$(ADK_RUNTIME_PASSWORD)' || \ $(SED) 's,\*NP\*,'"$$($(STAGING_HOST_DIR)/usr/bin/mkcrypt \ - ${ADK_RUNTIME_PASSWORD}),g" $(IDIR_BASE_FILES)/etc/shadow + $$(awk -F\= '/^ADK_RUNTIME_PASSWORD/ { print $$2 }' $(ADK_TOPDIR)/.config|sed -e 's^\"^^g')),g" \ + $(IDIR_BASE_FILES)/etc/shadow echo $(ADK_RUNTIME_TMPFS_SIZE) > $(IDIR_BASE_FILES)/etc/tmpfs ifeq ($(ADK_TARGET_WITH_ROOT_RW),y) echo 'export IPKGTMPDIR=/root/.ipkg' >> $(IDIR_BASE_FILES)/etc/profile -- cgit v1.2.3