diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-04-04 09:35:55 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-04-04 09:35:55 +0000 |
| commit | de0332f86a7d2017246a6c78ddad480005912e59 (patch) | |
| tree | 9746171896c3d5ee4759394edf0bdab4d8531386 /package | |
| parent | 714ffa32608e47de9260b1e950b9a74ca3a78da7 (diff) | |
| download | master-31e0f0ae-de0332f86a7d2017246a6c78ddad480005912e59.tar.gz master-31e0f0ae-de0332f86a7d2017246a6c78ddad480005912e59.tar.bz2 master-31e0f0ae-de0332f86a7d2017246a6c78ddad480005912e59.zip | |
rename our /bin/login script to /bin/login.sh to avoid collisions with busybox - we always use -l on telnetd anyway
SVN-Revision: 15097
Diffstat (limited to 'package')
| -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 |
3 files changed, 2 insertions, 2 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 } |