rsyslog: rename sysv initscript to S01logging

Do it to avoid having duplicate and conflicting functionality with
busybox's S01logging.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/rsyslog/S01logging b/package/rsyslog/S01logging
new file mode 100644 (file)
index 0000000..0c4bbc7
--- /dev/null
+++ b/package/rsyslog/S01logging
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# Starts rsyslog.
+#
+
+start() {
+       echo -n "Starting rsyslog daemon: "
+       umask 077
+       start-stop-daemon -S -q -p /var/run/rsyslogd.pid --exec /usr/sbin/rsyslogd
+       echo "OK"
+}
+stop() {
+       echo -n "Stopping rsyslog daemon: "
+       start-stop-daemon -K -q -p /var/run/rsyslogd.pid
+       echo "OK"
+}
+restart() {
+       stop
+       start
+}
+
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
+       ;;
+  restart|reload)
+       restart
+       ;;
+  *)
+       echo "Usage: $0 {start|stop|restart}"
+       exit 1
+esac
+
+exit $?
+

diff --git a/package/rsyslog/S01rsyslog b/package/rsyslog/S01rsyslog
deleted file mode 100644 (file)
index 0c4bbc7..0000000
--- a/package/rsyslog/S01rsyslog
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-#
-# Starts rsyslog.
-#
-
-start() {
-       echo -n "Starting rsyslog daemon: "
-       umask 077
-       start-stop-daemon -S -q -p /var/run/rsyslogd.pid --exec /usr/sbin/rsyslogd
-       echo "OK"
-}
-stop() {
-       echo -n "Stopping rsyslog daemon: "
-       start-stop-daemon -K -q -p /var/run/rsyslogd.pid
-       echo "OK"
-}
-restart() {
-       stop
-       start
-}
-
-case "$1" in
-  start)
-       start
-       ;;
-  stop)
-       stop
-       ;;
-  restart|reload)
-       restart
-       ;;
-  *)
-       echo "Usage: $0 {start|stop|restart}"
-       exit 1
-esac
-
-exit $?
-

diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index 688a335694c151de24e04bce87da89b4c87906f3..27a72da542dce80fb076f11b0b6e9a461e8d6692 100644 (file)
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -39,8 +39,8 @@ else
 endif
 
 define RSYSLOG_INSTALL_INIT_SYSV
-       $(INSTALL) -m 0755 -D package/rsyslog/S01rsyslog \
-               $(TARGET_DIR)/etc/init.d/S01rsyslog
+       $(INSTALL) -m 0755 -D package/rsyslog/S01logging \
+               $(TARGET_DIR)/etc/init.d/S01logging
 endef
 
 define RSYSLOG_INSTALL_INIT_SYSTEMD