rename our /bin/login script to /bin/login.sh to avoid collisions with busybox -...

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 89dc3bcfdf0fd0a5d1e3b09ac73ac6b5a04275c4..76443836e39e055642d02da5dcd0f8e9784c14d6 100755 (executable)
--- 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 ec99172cfd30fb534d120ff8f42c05d293c91d21..082aba7e90b9984cd024751925b6e3effc0ecb84 100755 (executable)
--- 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 1b3c924cedef0d311a466bd8b9a2b4d93ef9f676..25d11d96ab417b69c79aace5a233f47a6d856ac1 100755 (executable)
--- 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
 }