summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--changelog6
-rwxr-xr-xsrc.etc/init.d/httpd4
-rwxr-xr-xsrc.etc/init.d/klogd4
-rw-r--r--src.etc/init.d/ntpd4
-rwxr-xr-xsrc.etc/init.d/telnetd4
5 files changed, 14 insertions, 8 deletions
diff --git a/changelog b/changelog
index 0688d14..3d65e21 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+busybox (1.32.0-4) trunk
+
+ * Normalize log messages in service initialization scripts.
+
+ -- Patrick McDermott <patrick.mcdermott@libiquity.com> Sun, 13 Dec 2020 11:19:10 -0500
+
busybox (1.32.0-3) trunk
* </usr/share/udhcpc/default.script> now supports the "ip route"
diff --git a/src.etc/init.d/httpd b/src.etc/init.d/httpd
index c26e151..2ebd361 100755
--- a/src.etc/init.d/httpd
+++ b/src.etc/init.d/httpd
@@ -5,13 +5,13 @@ STOP='60'
start()
{
- log 'Starting httpd'
+ log 'Starting HTTP daemon'
start-stop-daemon -S -q -p /var/run/httpd.pid -m \
-x /usr/sbin/httpd -b -- -f -h /var/www
}
stop()
{
- log 'Stopping httpd'
+ log 'Stopping HTTP daemon'
start-stop-daemon -K -q -p /var/run/httpd.pid
}
diff --git a/src.etc/init.d/klogd b/src.etc/init.d/klogd
index 20b7ac3..93fbeee 100755
--- a/src.etc/init.d/klogd
+++ b/src.etc/init.d/klogd
@@ -5,12 +5,12 @@ STOP='70'
start()
{
- log 'Starting klogd'
+ log 'Starting kernel log daemon'
start-stop-daemon -S -q -x /sbin/klogd
}
stop()
{
- log 'Stopping klogd'
+ log 'Stopping kernel log daemon'
start-stop-daemon -K -q -p /var/run/klogd.pid
}
diff --git a/src.etc/init.d/ntpd b/src.etc/init.d/ntpd
index 7007042..a71995e 100644
--- a/src.etc/init.d/ntpd
+++ b/src.etc/init.d/ntpd
@@ -5,7 +5,7 @@ STOP='75'
start()
{
- log 'Starting ntpd'
+ log 'Starting NTP daemon'
start-stop-daemon -S -q -x /usr/sbin/ntpd -- \
-p 0.pool.ntp.org \
-p 1.pool.ntp.org \
@@ -15,6 +15,6 @@ start()
stop()
{
- log 'Stopping ntpd'
+ log 'Stopping NTP daemon'
start-stop-daemon -K -q -p /var/run/ntpd.pid
}
diff --git a/src.etc/init.d/telnetd b/src.etc/init.d/telnetd
index 98f668d..4bb7613 100755
--- a/src.etc/init.d/telnetd
+++ b/src.etc/init.d/telnetd
@@ -5,13 +5,13 @@ STOP='60'
start()
{
- log 'Starting telnetd'
+ log 'Starting telnet daemon'
start-stop-daemon -S -q -p /var/run/telnetd.pid -m \
-x /usr/sbin/telnetd -b -- -F
}
stop()
{
- log 'Stopping telnetd'
+ log 'Stopping telnet daemon'
start-stop-daemon -K -q -p /var/run/telnetd.pid
}