From fcd35cb0612843f78e375122e501ee602e8fc692 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 4 Apr 2009 09:35:55 +0000
Subject: rename our /bin/login script to /bin/login.sh to avoid collisions
 with busybox - we always use -l on telnetd anyway

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15097 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/files/bin/login    | 18 ------------------
 package/base-files/files/bin/login.sh | 18 ++++++++++++++++++
 package/base-files/files/etc/preinit  |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)
 delete mode 100755 package/base-files/files/bin/login
 create mode 100755 package/base-files/files/bin/login.sh

(limited to 'package/base-files')

diff --git a/package/base-files/files/bin/login b/package/base-files/files/bin/login
deleted file mode 100755
index ff5d3660e..000000000
--- a/package/base-files/files/bin/login
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
-
-grep '^root:[^!]' /etc/passwd >&- 2>&-
-[ "$?" = "0" -a -z "$FAILSAFE" ]  &&  
-{
-    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
diff --git a/package/base-files/files/bin/login.sh b/package/base-files/files/bin/login.sh
new file mode 100755
index 000000000..ff5d3660e
--- /dev/null
+++ b/package/base-files/files/bin/login.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+
+grep '^root:[^!]' /etc/passwd >&- 2>&-
+[ "$?" = "0" -a -z "$FAILSAFE" ]  &&  
+{
+    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
diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
index 89dc3bcfd..76443836e 100755
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -11,7 +11,7 @@ failsafe() {
 	[ -n "$ifname" ] && grep "$ifname" /proc/net/dev >/dev/null && {
 		failsafe_ip
 		netmsg 192.168.1.255 "Entering Failsafe!"
-		telnetd -l /bin/login <> /dev/null 2>&1
+		telnetd -l /bin/login.sh <> /dev/null 2>&1
 	}
 	lock /tmp/.failsafe
 	ash --login
-- 
cgit v1.2.3