diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-04-04 09:35:55 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-04-04 09:35:55 +0000 |
commit | fcd35cb0612843f78e375122e501ee602e8fc692 (patch) | |
tree | 5021fe411a0b30dac9f7fd94d8bda65374c1f950 | |
parent | d58097e65d4681baa09ddedb006dd82c1f4c3354 (diff) |
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
-rwxr-xr-x | package/base-files/files/bin/login.sh (renamed from package/base-files/files/bin/login) | 0 | ||||
-rwxr-xr-x | package/base-files/files/etc/preinit | 2 | ||||
-rwxr-xr-x | package/busybox/files/telnet | 2 | ||||
-rwxr-xr-x | target/linux/brcm-2.4/base-files/etc/preinit.arch | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/package/base-files/files/bin/login b/package/base-files/files/bin/login.sh index ff5d3660e4..ff5d3660e4 100755 --- a/package/base-files/files/bin/login +++ b/package/base-files/files/bin/login.sh diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit index 89dc3bcfdf..76443836e3 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 ec99172cfd..082aba7e90 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 1b3c924ced..25d11d96ab 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 } |