From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 4 Apr 2009 09:35:55 +0000 (+0000)
Subject: rename our /bin/login script to /bin/login.sh to avoid collisions with busybox -... 
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=fcd35cb0612843f78e375122e501ee602e8fc692;p=openwrt-10.03%2F.git

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
---

diff --git a/package/base-files/files/bin/login b/package/base-files/files/bin/login.sh
similarity index 100%
rename from package/base-files/files/bin/login
rename to package/base-files/files/bin/login.sh
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
diff --git a/package/busybox/files/telnet b/package/busybox/files/telnet
index ec99172cf..082aba7e9 100755
--- a/package/busybox/files/telnet
+++ b/package/busybox/files/telnet
@@ -7,7 +7,7 @@ start() {
 		awk -F: '/^root:/ && ($2 != "") && ($2 !~ /\!/) {exit 1}' /etc/passwd 2>/dev/null || \
 		( [ \! -x /usr/sbin/dropbear ] && [ \! -x /usr/sbin/sshd ] )
 	then \
-		telnetd -l /bin/login
+		telnetd -l /bin/login.sh
 	fi
 }
 
diff --git a/target/linux/brcm-2.4/base-files/etc/preinit.arch b/target/linux/brcm-2.4/base-files/etc/preinit.arch
index 1b3c924ce..25d11d96a 100755
--- a/target/linux/brcm-2.4/base-files/etc/preinit.arch
+++ b/target/linux/brcm-2.4/base-files/etc/preinit.arch
@@ -15,7 +15,7 @@ failsafe() {
 	}
 
 	netmsg 192.168.1.255 "Entering Failsafe!"
-	telnetd -l /bin/login <> /dev/null 2>&1
+	telnetd -l /bin/login.sh <> /dev/null 2>&1
 
 	ash --login
 }