base-files: another empty password check fix (#10440)

SVN-Revision: 29208

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index b93d2cb40262fc7a1b2e3fe33389accc93b6add4..9b3745ba98c0435ea375322423ddd9db1aee3bf7 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=96
+PKG_RELEASE:=97
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host

diff --git a/package/base-files/files/bin/login.sh b/package/base-files/files/bin/login.sh
index 6682b022bad6ff314c36c5b0c0af916227c7bc2b..04b3fe25021b6c3e60c2b298119761e5113c3480 100755 (executable)
--- a/package/base-files/files/bin/login.sh
+++ b/package/base-files/files/bin/login.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright (C) 2006-2011 OpenWrt.org
 
-if ( ! grep -qs '^root::' /etc/shadow || \
+if ( ! grep -qs '^root:[!x]\?:' /etc/shadow || \
      ! grep -qs '^root:[!x]\?:' /etc/passwd ) && \
    [ -z "$FAILSAFE" ]
 then