[package] qos-scripts: Rework qos-stat script

[openwrt.git] / package / base-files / files / bin / login.sh

diff --git a/package/base-files/files/bin/login.sh b/package/base-files/files/bin/login.sh
index ff5d366..a64c84e 100755 (executable)
--- a/package/base-files/files/bin/login.sh
+++ b/package/base-files/files/bin/login.sh
@@ -1,18 +1,16 @@
 #!/bin/sh
 #!/bin/sh

-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org

 
 

-grep '^root:[^!]' /etc/passwd >&- 2>&-
-[ "$?" = "0" -a -z "$FAILSAFE" ]  &&  
-{
-    echo "Login failed."
-    exit 0
-} || {
+if grep -qs '^root:[^!]' /etc/passwd /etc/shadow && [ -z "$FAILSAFE" ]; then
+       echo "Login failed."
+       exit 0
+else

 cat << EOF
  === IMPORTANT ============================
   Use 'passwd' to set your login password
   this will disable telnet and enable SSH
  ------------------------------------------
 EOF
 cat << EOF
  === IMPORTANT ============================
   Use 'passwd' to set your login password
   this will disable telnet and enable SSH
  ------------------------------------------
 EOF

-}
+fi

 
 exec /bin/ash --login
 
 exec /bin/ash --login