From 010e58d2092b6c8637a84eba7d9d1d43dfd71b39 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 17 Nov 2011 09:40:06 +0000 Subject: [PATCH] base-files: another empty password check fix (#10440) SVN-Revision: 29208 --- package/base-files/Makefile | 2 +- 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