[package] busybox: get root home dir from /etc/passwd in telnet init script (thanks...

SVN-Revision: 25417

diff --git a/package/busybox/files/telnet b/package/busybox/files/telnet
index f294c5590bd1e4d179eddf1a06564728c853a939..88f8af9d750300093290394b05f2c3b686717c47 100755 (executable)
--- a/package/busybox/files/telnet
+++ b/package/busybox/files/telnet
@@ -10,9 +10,16 @@ has_root_pwd() {
        test -n "${pwd#!}"
 }
 
+get_root_home() {
+       local homedir=$([ -f "$1" ] && cat "$1")
+       homedir="${homedir#*:*:0:0:*:}"
+
+       echo "${homedir%%:*}"
+}
+
 has_ssh_pubkey() {
        ( /etc/init.d/dropbear enabled 2> /dev/null && grep -qs "^ssh-" /etc/dropbear/authorized_keys ) || \
-       ( /etc/init.d/sshd enabled 2> /dev/null && grep -qs "^ssh-" /root/.ssh/authorized_keys )
+       ( /etc/init.d/sshd enabled 2> /dev/null && grep -qs "^ssh-" "$(get_root_home /etc/passwd)"/.ssh/authorized_keys )
 }
 
 start() {