From patchwork Sat Nov 3 18:24:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 992672 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=datacom.com.br Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42nS5s03MQzB4gK for ; Sun, 4 Nov 2018 05:24:48 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 24C9886E92; Sat, 3 Nov 2018 18:24:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lGkLkTkyt19I; Sat, 3 Nov 2018 18:24:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 411F685FD0; Sat, 3 Nov 2018 18:24:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4A84B1BF3EB for ; Sat, 3 Nov 2018 18:24:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 45E97875CA for ; Sat, 3 Nov 2018 18:24:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4tuSoVmEXJNC for ; Sat, 3 Nov 2018 18:24:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.datacom.com.br (mx.datacom.ind.br [177.66.5.10]) by whitealder.osuosl.org (Postfix) with ESMTPS id 025A2875A2 for ; Sat, 3 Nov 2018 18:24:39 +0000 (UTC) Received: from mail.datacom.com.br (localhost [127.0.0.1]) by mail.datacom.com.br (Postfix) with ESMTPS id 9D2FA1BA11BA; Sat, 3 Nov 2018 15:25:03 -0300 (-03) Received: from localhost (localhost [127.0.0.1]) by mail.datacom.com.br (Postfix) with ESMTP id 862881BA0E4D; Sat, 3 Nov 2018 15:25:03 -0300 (-03) Received: from mail.datacom.com.br ([127.0.0.1]) by localhost (mail.datacom.com.br [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id it6TJ7kWd6rD; Sat, 3 Nov 2018 15:25:03 -0300 (-03) Received: from p7-1130br.casantos.org (unknown [201.86.221.14]) by mail.datacom.com.br (Postfix) with ESMTPSA id ECC3F1BA11BB; Sat, 3 Nov 2018 15:25:02 -0300 (-03) From: Carlos Santos To: buildroot@buildroot.org Date: Sat, 3 Nov 2018 15:24:25 -0300 Message-Id: <20181103182427.11738-3-casantos@datacom.com.br> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181103182427.11738-1-casantos@datacom.com.br> References: <20181103182427.11738-1-casantos@datacom.com.br> Subject: [Buildroot] [PATCH v4 2/4] rsyslog: rewrite init script X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Duskett MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Rename it to S01rsyslogd to make every init script be called the same as the executable it starts. - Support a /etc/default/rsyslogd configuration file. - Indent with tabs, not spaces. Signed-off-by: Carlos Santos Reviewed-by: Matt Weber --- Changes v1->v2 - Implement suggestions made by Nicolas Cavallari and Arnout Vandecappelle Changes v2->v3 - Include /etc/default/logging, not /etc/default/$DAEMON. Changes v3-v4 - Follow the decisions taken at the Buildroot meeting. - Leave the daemon args themselves on a separate line, as suggested by Arnout Vandecappelle. - Use a less fancy commit message :-) --- package/rsyslog/S01logging | 36 ------------------------- package/rsyslog/S01rsyslogd | 53 +++++++++++++++++++++++++++++++++++++ package/rsyslog/rsyslog.mk | 4 +-- 3 files changed, 55 insertions(+), 38 deletions(-) delete mode 100644 package/rsyslog/S01logging create mode 100644 package/rsyslog/S01rsyslogd diff --git a/package/rsyslog/S01logging b/package/rsyslog/S01logging deleted file mode 100644 index 8e4a59c2d5..0000000000 --- a/package/rsyslog/S01logging +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -start() { - printf "Starting rsyslog daemon: " - start-stop-daemon -S -q -p /var/run/rsyslogd.pid --exec /usr/sbin/rsyslogd - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -stop() { - printf "Stopping rsyslog daemon: " - start-stop-daemon -K -q -p /var/run/rsyslogd.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -restart() { - stop - sleep 1 - 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/S01rsyslogd b/package/rsyslog/S01rsyslogd new file mode 100644 index 0000000000..e9922d932d --- /dev/null +++ b/package/rsyslog/S01rsyslogd @@ -0,0 +1,53 @@ +#!/bin/sh + +DAEMON="rsyslogd" +PIDFILE="/var/run/$DAEMON.pid" + +RSYSLOGD_ARGS="" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ + -- $RSYSLOGD_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature (does not + # reconfigure/restart on SIGHUP, just closes all open files). + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index 61e08ba765..fcd476cee3 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -72,8 +72,8 @@ RSYSLOG_CONF_OPTS += \ endif define RSYSLOG_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/rsyslog/S01logging \ - $(TARGET_DIR)/etc/init.d/S01logging + $(INSTALL) -m 0755 -D package/rsyslog/S01rsyslogd \ + $(TARGET_DIR)/etc/init.d/S01rsyslogd endef # The rsyslog.service is installed by rsyslog, but the link is not created