From patchwork Tue Feb 5 10:49:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1036617 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="fkHSSOEJ"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43v1dj2lRKz9sMl for ; Tue, 5 Feb 2019 21:53:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E9CA530C94; Tue, 5 Feb 2019 10:53:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HnnEKPby8WLv; Tue, 5 Feb 2019 10:53:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id DE0D130CC6; Tue, 5 Feb 2019 10:53:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 6BA871BF283 for ; Tue, 5 Feb 2019 10:52:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id AF17F81FB1 for ; Tue, 5 Feb 2019 10:52:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zIMpZSO1GoWu for ; Tue, 5 Feb 2019 10:52:36 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by hemlock.osuosl.org (Postfix) with ESMTPS id 808A5884E6 for ; Tue, 5 Feb 2019 10:50:10 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id f188so3058489wmf.5 for ; Tue, 05 Feb 2019 02:50:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=AyVTzy3J0ap+IPEBdPyRE0ZM4IfzSvOp7WrVQHZe5C4=; b=fkHSSOEJJFYgJR0VJrlX9mDLe/D26GWZUZJOySw2GV3qPLYmFQQU9BnMXMGdHW1dmW nrfdaTS/P+/YNyyckg6EWhNuK1+xMeEjt5lP+0TlXk+cpcgIYFNWDMUUcGEJHfFV/C7F 8LSqW6j0zeag89b8hcoyJIbzCRob9FwYjbHEo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=AyVTzy3J0ap+IPEBdPyRE0ZM4IfzSvOp7WrVQHZe5C4=; b=cDM1GJEZ2gSEoW+mbP0M+fyTQCLDXh4+VrH+ajk6dUppO+2YW/HGKTRmW+V18Sc3ul tnK6GaMj0eoXV0ek+DWX+KRqgp2ymKS3BbEzRN6NeL49AD1H3siGA7xGI6vaAKe09/h6 MwYdQHr8cWlreUVw9VnI9tYj5wfFGcZAPWeNccKfuafWBQNzg3XH6zbJaMvf6/w2rKiH dVKi/MA6HVJymVszfpB3r9iBBc+2Vq5QKUnvB5VeO4ZNus0zJdOPzZF+5OvNwoQcExiC EE8x6MA+lHYc+SYJDu9PuySAxfJeWTikrHGEiYiQi9EFlvxno3qrHw1SUacLdWf7s8Zr mF2g== X-Gm-Message-State: AHQUAuYoemH5klBeskbreaT8qd89ozV3MGOFaHYnpyvGH86YV10f3kgu oxAeLjy5YE3Lmju8uchMVlb22GFLKOyxXg== X-Google-Smtp-Source: AHgI3IbNcdaVMUjJQerVKtcOtZqkOekFRcDgDgAT91q5L3wj9sU1t88cqdVDpntAsNOXyvsMuiykOQ== X-Received: by 2002:a7b:c191:: with SMTP id y17mr3201243wmi.60.1549363808604; Tue, 05 Feb 2019 02:50:08 -0800 (PST) Received: from localhost.localdomain ([2620:0:1055:fd00:3c25:d51f:f59f:7d82]) by smtp.gmail.com with ESMTPSA id y138sm20114681wmc.16.2019.02.05.02.50.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Feb 2019 02:50:07 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 5 Feb 2019 11:49:56 +0100 Message-Id: <1549363799-30840-3-git-send-email-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1549363799-30840-1-git-send-email-angelo@amarulasolutions.com> References: <1549363799-30840-1-git-send-email-angelo@amarulasolutions.com> Subject: [Buildroot] [PATCH v3 2/5] package/mender: adding systemv init file 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: Angelo Compagnucci MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch adds a service file for the init system v. Signed-off-by: Angelo Compagnucci Acked-by: Reviewed-by: Titouan Christophe --- [v2 -> v3]: * Moved the service to s42 to have the network ready before running Mender as pointed out by Titouan package/mender/S42mender | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ package/mender/mender.mk | 5 +++++ 2 files changed, 61 insertions(+) create mode 100644 package/mender/S42mender diff --git a/package/mender/S42mender b/package/mender/S42mender new file mode 100644 index 0000000..d5266aa --- /dev/null +++ b/package/mender/S42mender @@ -0,0 +1,56 @@ +#!/bin/sh +# +# Starts mender service. +# + +start() { + # If /var/lib/mender is a symlink to /var/run/mender, and + # - the filesystem is RO (i.e. we can not rm the symlink), + # create the directory pointed to by the symlink. + # - the filesystem is RW (i.e. we can rm the symlink), + # replace the symlink with an actual directory + if [ -L /var/lib/mender \ + -a "$(readlink /var/lib/mender)" = "/var/run/mender" ] + then + if rm -f /var/lib/mender >/dev/null 2>&1; then + mkdir -p /var/lib/mender + else + echo "No persistent location to store mender data. Data will be lost" + echo "at reboot. Are you sure this is what you want to do?" + mkdir -p "$(readlink /var/lib/mender)" + fi + fi + + printf "Starting mender service: " + umask 077 + + start-stop-daemon -S -q -p /var/run/mender.pid \ + --exec /usr/bin/mender -- -daemon + [ $? = 0 ] && echo "OK" || echo "FAIL" +} +stop() { + printf "Stopping mender mender: " + start-stop-daemon -K -q -p /var/run/mender.pid + [ $? = 0 ] && echo "OK" || echo "FAIL" +} +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/mender/mender.mk b/package/mender/mender.mk index 3203df8..dc4a73b 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -63,4 +63,9 @@ define MENDER_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mender.service endef +define MENDER_INSTALL_INIT_SYSV + $(INSTALL) -D -m 755 package/mender/S04mender \ + $(TARGET_DIR)/etc/init.d/S04mender +endef + $(eval $(golang-package))