Merged enhancements submitted by Stereo, thanks, closes #188 and #189

SVN-Revision: 2863

diff --git a/openwrt/package/base-files/default/etc/init.d/S50telnet b/openwrt/package/base-files/default/etc/init.d/S50telnet
index 599c3540eb53d52fa99b3d03069e2c1b5a3ede99..e7d4d3677350abaa4ddd45fac61638ca2d0b0367 100755 (executable)
--- a/openwrt/package/base-files/default/etc/init.d/S50telnet
+++ b/openwrt/package/base-files/default/etc/init.d/S50telnet
@@ -1,2 +1,2 @@
 #!/bin/sh
-telnetd -l /bin/login
+if awk -F: '/^root:/ && $2 !~ /\*/ {exit 1}' /etc/passwd 2>/dev/null || test $FAILSAFE; then telnetd -l /bin/login; fi

diff --git a/openwrt/package/openntpd/files/ntpd.init b/openwrt/package/openntpd/files/ntpd.init
index e528748780d6817e8067bd081875152d0cd27b78..8bac705b4ae756af5933895403f4e5cfbf910580 100644 (file)
--- a/openwrt/package/openntpd/files/ntpd.init
+++ b/openwrt/package/openntpd/files/ntpd.init
@@ -1,3 +1,3 @@
 #!/bin/sh
-mkdir -p `grep "^ntp:" /etc/passwd | cut -d: -f6`
+mkdir -p `awk -F: '/^ntp:/{print $6}' /etc/passwd`
 /usr/sbin/ntpd -s