X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Fdefault%2Ftarget_skeleton%2Fbin%2Flogin;h=bb065e54a1bfcec7e6a5e1f7fdb7eaba2dd08c1a;hb=9039a0cd663896b5fd189317f2b633ac0cf67a31;hp=238e971aaf132db738099eb62461d3c83a4f1f07;hpb=c409fe0b60a3f595696cee4eb06a3b0379234f1c;p=openwrt-10.03%2F.git

diff --git a/target/default/target_skeleton/bin/login b/target/default/target_skeleton/bin/login
index 238e971aa..bb065e54a 100755
--- a/target/default/target_skeleton/bin/login
+++ b/target/default/target_skeleton/bin/login
@@ -1,21 +1,20 @@
 #!/bin/sh
-[ "$FAILSAFE" = "true" ] && exec /bin/ash --login
-
-[ -f /etc/sysconf ] && . /etc/sysconf
-
-if [ "$BR2_SYSCONF_TELNET_FAILSAFE_ONLY" = "y" ]; then
-        if grep '^root:!' /etc/passwd > /dev/null 2>/dev/null; then
-                echo "You need to set a login password to protect your"
-                echo "Router from unauthorized access."
-                echo
-                echo "Use 'passwd' to set your password."
-                echo "telnet login will be disabled afterwards,"
-                echo "You can then login using SSH."
-                echo
-        else
-                echo "Login failed."
-                exit 0
-        fi
-fi
+. /etc/sysconf 2>&-
 
+[ "$FAILSAFE" != "true" ] &&
+[ "$BR2_SYSCONF_TELNET_FAILSAFE_ONLY" = "y" ] &&
+{
+  grep '^root:[^!]' /etc/passwd >&- 2>&- &&
+  {
+    echo "Login failed."
+    exit 0
+  } || {
+cat << EOF
+ === IMPORTANT ============================
+  Use 'passwd' to set your login password
+  this will disable telnet and enable SSH
+ ------------------------------------------
+EOF
+  }
+}
 exec /bin/ash --login