aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-11-11 13:25:31 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-11-11 13:25:31 +0000
commitc6af60f433ffe9c68626b2d65584115071349f15 (patch)
tree86e60df896792ed59a76e7b2dc830b9ffaa8d9bf
parentaacccbc3c142d01ff2bf3f73ba66b7846b131444 (diff)
downloadupstream-c6af60f433ffe9c68626b2d65584115071349f15.tar.gz
upstream-c6af60f433ffe9c68626b2d65584115071349f15.tar.bz2
upstream-c6af60f433ffe9c68626b2d65584115071349f15.zip
[package] base-files: now that the initial password is completely empty (and not primed with "!") adjust login.sh for it to make telnetd available again
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28943 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/files/bin/login.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index da9e6f3727..c515dcf7b1 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:=92
+PKG_RELEASE:=93
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 a64c84e1e2..b46769a012 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-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
-if grep -qs '^root:[^!]' /etc/passwd /etc/shadow && [ -z "$FAILSAFE" ]; then
+if grep -qs '^root:[^!:]' /etc/passwd /etc/shadow && [ -z "$FAILSAFE" ]; then
echo "Login failed."
exit 0
else