diff options
| -rwxr-xr-x | build | 11 | ||||
| -rwxr-xr-x | busybox.pkg/postinst | 11 | ||||
| -rwxr-xr-x | busybox.pkg/prerm | 4 | ||||
| -rw-r--r-- | changelog | 1 | ||||
| -rw-r--r-- | scripts | 12 |
5 files changed, 22 insertions, 17 deletions
@@ -54,10 +54,13 @@ install: build ln -sf rc dest/etc/init.d/rcS; \ ln -sf rc dest/etc/init.d/rcK; \ while read -r config script links; do \ - config_enabled "$${config}" && \ - install_init_script "$${script}" $${links}; \ - [ "x$${links:+set}" != 'xset' ] && \ - printf '%s\n' "$${script}" >&3; \ + if [ "x$${links%abled}" = "x$${links}" ]; then + config_enabled "$${config}" && \ + install_init_script "$${script}" \ + $${links}; \ + else \ + printf '%s %s\n' "$${script}" "$${links}" >&3; \ + fi; \ done <../scripts; \ exec 3>&-; \ fi; \ diff --git a/busybox.pkg/postinst b/busybox.pkg/postinst index c003561..9f23a39 100755 --- a/busybox.pkg/postinst +++ b/busybox.pkg/postinst @@ -13,11 +13,12 @@ if [ "x${1}" = 'xconfigure' ]; then fi fi if [ -f /usr/share/busybox/init-scripts ]; then - for script in $(cat /usr/share/busybox/init-scripts); do - if [ "x${2:+set}" != 'xset' ]; then - "/etc/init.d/${script}" enable + while read -r script enabled; do + if [ "x${enabled}" = 'xenabled' ]; then + [ "x${2:+set}" != 'xset' ] && \ + "/etc/init.d/${script}" enable + "/etc/init.d/${script}" start fi - "/etc/init.d/${script}" start - done + done </usr/share/busybox/init-scripts fi fi diff --git a/busybox.pkg/prerm b/busybox.pkg/prerm index 96a3db6..30ebdab 100755 --- a/busybox.pkg/prerm +++ b/busybox.pkg/prerm @@ -2,9 +2,9 @@ if [ "x${1}" = 'xupgrade' ]; then if [ -f /usr/share/busybox/init-scripts ]; then - for script in $(cat /usr/share/busybox/init-scripts); do + while read -r script enabled; do "/etc/init.d/${script}" stop - done + done </usr/share/busybox/init-scripts fi while read link name prio; do update-alternatives --remove "${name}" "${link}.busybox" @@ -3,6 +3,7 @@ busybox (1.21.1-8) trunk * Actually distribute /etc/init.d/boottime. * busybox no longer provides the default Web page. This is now in the branding package. + * Disable the telnetd service by default. -- "P. J. McDermott" <pj@pehjota.net> Fri, 20 Jun 2014 01:13:24 -0400 @@ -1,13 +1,13 @@ HOSTNAME hostname S03 -HTTPD httpd -KLOGD klogd +HTTPD httpd enabled +KLOGD klogd enabled MDEV mdev S02 K98 FEATURE_MOUNT_FSTAB mountall S30 K70 FEATURE_MOUNT_FLAGS mountdevsubfs S03 K97 FEATURE_MOUNT_FLAGS mountkernfs S01 K99 FEATURE_MOUNT_FLAGS mounttmpfs S03 K97 IFUPDOWN networking S20 K80 -SYSLOGD syslog -TELNETD telnetd -- boottime -- rc.local +SYSLOGD syslog enabled +TELNETD telnetd disabled +- boottime enabled +- rc.local enabled |