From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 30 Nov 2014 14:17:49 +0000 (+0100)
Subject: vsftpd: use <pkg>_INSTALL_INIT_SYSV and rename init script
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6b1c75cbdc8ffe825c3954bb57bd14320d5cb693;p=buildroot.git

vsftpd: use <pkg>_INSTALL_INIT_SYSV and rename init script

This commit changes the vsftpd package to use the
<pkg>_INSTALL_INIT_SYSV mechanism to install its init script, and
renames the init script in the Buildroot source tree to match how it's
named on the target.

Also, the init script is now installed unconditionally, as is done in
most packages.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

diff --git a/package/vsftpd/S70vsftpd b/package/vsftpd/S70vsftpd
new file mode 100755
index 0000000000..6048907f60
--- /dev/null
+++ b/package/vsftpd/S70vsftpd
@@ -0,0 +1,33 @@
+#! /bin/sh
+
+set -e
+
+DESC="vsftpd"
+NAME=vsftpd
+DAEMON=/usr/sbin/$NAME
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon -S -b -x $NAME
+	echo "OK"
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon -K -x $NAME
+	echo "OK"
+	;;
+  restart|force-reload)
+	echo "Restarting $DESC: "
+	$0 stop
+	sleep 1
+	$0 start
+	echo ""
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/package/vsftpd/vsftpd-init b/package/vsftpd/vsftpd-init
deleted file mode 100755
index 6048907f60..0000000000
--- a/package/vsftpd/vsftpd-init
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-
-set -e
-
-DESC="vsftpd"
-NAME=vsftpd
-DAEMON=/usr/sbin/$NAME
-
-case "$1" in
-  start)
-	echo -n "Starting $DESC: "
-	start-stop-daemon -S -b -x $NAME
-	echo "OK"
-	;;
-  stop)
-	echo -n "Stopping $DESC: "
-	start-stop-daemon -K -x $NAME
-	echo "OK"
-	;;
-  restart|force-reload)
-	echo "Restarting $DESC: "
-	$0 stop
-	sleep 1
-	$0 start
-	echo ""
-	;;
-  *)
-	echo "Usage: $0 {start|stop|restart|force-reload}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk
index cab5afb732..1c468edd6d 100644
--- a/package/vsftpd/vsftpd.mk
+++ b/package/vsftpd/vsftpd.mk
@@ -43,15 +43,16 @@ define VSFTPD_BUILD_CMDS
 		LDFLAGS="$(TARGET_LDFLAGS)" LIBS="$(VSFTPD_LIBS)" -C $(@D)
 endef
 
+define VSFTPD_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 755 package/vsftpd/S70vsftpd $(TARGET_DIR)/etc/init.d/S70vsftpd
+endef
+
 define VSFTPD_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 755 $(@D)/vsftpd $(TARGET_DIR)/usr/sbin/vsftpd
 	$(INSTALL) -D -m 644 $(@D)/vsftpd.8 \
 		$(TARGET_DIR)/usr/share/man/man8/vsftpd.8
 	$(INSTALL) -D -m 644 $(@D)/vsftpd.conf.5 \
 		$(TARGET_DIR)/usr/share/man/man5/vsftpd.conf.5
-	test -f $(TARGET_DIR)/etc/init.d/S70vsftpd || \
-		$(INSTALL) -D -m 755 package/vsftpd/vsftpd-init \
-			$(TARGET_DIR)/etc/init.d/S70vsftpd
 	test -f $(TARGET_DIR)/etc/vsftpd.conf || \
 		$(INSTALL) -D -m 644 $(@D)/vsftpd.conf \
 			$(TARGET_DIR)/etc/vsftpd.conf