From 36d63c60dbe2d074dff81a6af7dd77b62b5f23dc Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbrodkorb@conet.de>
Date: Thu, 4 Dec 2014 14:07:36 +0100
Subject: Revert "allow passwords with special characters, like #. reported by
 Martin T."

This reverts commit e816651b1653ef168af2fcae483abc79e427a70d.
---
 package/base-files/Makefile | 6 +++---
 rules.mk                    | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 8cc414472..0ca11d180 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:=		6
+PKG_RELEASE:=		5
 PKG_SECTION:=		base/apps
 PKG_DESCR:=		basic files and scripts
 
@@ -78,8 +78,8 @@ endif
 	    echo "::1		localhost" >> $(IDIR_BASE_FILES)/etc/hosts
 	    echo "127.0.1.1	$(ADK_RUNTIME_HOSTNAME)" >> $(IDIR_BASE_FILES)/etc/hosts
 	test -z $(ADK_RUNTIME_PASSWORD) || \
-	    passwd=$$($(STAGING_HOST_DIR)/usr/bin/mkcrypt '${ADK_RUNTIME_PASSWORD}'); \
-	    $(SED) "s,\*NP\*,$$passwd,g" $(IDIR_BASE_FILES)/etc/shadow
+	    $(SED) 's,\*NP\*,'"$$($(STAGING_HOST_DIR)/usr/bin/mkcrypt \
+	    ${ADK_RUNTIME_PASSWORD}),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
diff --git a/rules.mk b/rules.mk
index a659baf04..84356d59d 100644
--- a/rules.mk
+++ b/rules.mk
@@ -46,7 +46,6 @@ ADK_TARGET_SUFFIX:=			$(strip $(subst ",, $(ADK_TARGET_SUFFIX)))
 ADK_TARGET_CMDLINE:=			$(strip $(subst ",, $(ADK_TARGET_CMDLINE)))
 ADK_QEMU_ARGS:=				$(strip $(subst ",, $(ADK_QEMU_ARGS)))
 ADK_RUNTIME_TMPFS_SIZE:=		$(strip $(subst ",, $(ADK_RUNTIME_TMPFS_SIZE)))
-ADK_RUNTIME_PASSWORD:=			$(strip $(subst ",, $(ADK_RUNTIME_PASSWORD)))
 ADK_RUNTIME_CONSOLE_SERIAL_SPEED:=	$(strip $(subst ",, $(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)))
 ADK_RUNTIME_CONSOLE_SERIAL_DEVICE:=	$(strip $(subst ",, $(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE)))
 ADK_HOST:=				$(strip $(subst ",, $(ADK_HOST)))
-- 
cgit v1.2.3