From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 13 Jan 2015 23:16:58 +0000 (-0300)
Subject: rsyslog: rename sysv initscript to S01logging
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3f74996c1e168f5ab910033e5f7f3039e3831d58;p=buildroot.git

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
index 0000000000..0c4bbc7325
--- /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
index 0c4bbc7325..0000000000
--- 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 688a335694..27a72da542 100644
--- 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