diff options
author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-17 09:40:06 +0000 |
---|---|---|
committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-17 09:40:06 +0000 |
commit | b668d3deb84d791f5ca5ecd5544658457c44b7b0 (patch) | |
tree | 79469742d04f3855467cdf69432f96fc7392001b /package/base-files | |
parent | e9531fc3c0bc6e62d896394c78f581f00b2a0905 (diff) |
[package] base-files: another empty password check fix (#10440)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29208 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files')
-rw-r--r-- | package/base-files/Makefile | 2 | ||||
-rwxr-xr-x | package/base-files/files/bin/login.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index b93d2cb402..9b3745ba98 100644 --- 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 6682b022ba..04b3fe2502 100755 --- 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 |