From patchwork Tue Feb 4 10:06:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 316515 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 8B9192C009A for ; Tue, 4 Feb 2014 21:06:21 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1432793BE8; Tue, 4 Feb 2014 10:06:19 +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 3sdhAMhT0-Vu; Tue, 4 Feb 2014 10:06:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 7586B93BEF; Tue, 4 Feb 2014 10:06:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4A81C1BF9DB for ; Tue, 4 Feb 2014 10:06:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 473AD8C02C for ; Tue, 4 Feb 2014 10:06:15 +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 wj3bqFEztNdL for ; Tue, 4 Feb 2014 10:06:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7E3058C00D for ; Tue, 4 Feb 2014 10:06:14 +0000 (UTC) Received: by mail-wg0-f43.google.com with SMTP id y10so12641301wgg.10 for ; Tue, 04 Feb 2014 02:06:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kKgDq+FSI9bM+nQTjrCaI6SYqgSJHOE9+7MEj8dBB8c=; b=XnT5YYDMmV8Smju+6cA1X/QJywwOtk5mAxN+Q4pX6T1SQkLkbBv72bxmgxMPpFtaBQ gFj4+hIjtgS9TmDnbtlkz2H8KzVGXzH9E9xaHapWraDGfQjlmkl7fOSIWoyJELveUSG2 Rg2wGCp5G/8v4swBdD0NtVMJrOk9+dZyeE/Oc5OpXLUq+V6q24imufDdc14R6VS5CuLX uRN1nf/+pIQpmNDH4XmB5VzUGZBHlWT9ansgba1u7P3banDsbhzJdZOI/kONyrtE9ksl mvhkoHNO5TqSzk3Efd+9TLr3bHP1y3DGW/nVltxF+8ljuz+RX6gL3f8roWNrOxCKzU28 zy6Q== X-Received: by 10.181.11.201 with SMTP id ek9mr11862201wid.54.1391508372465; Tue, 04 Feb 2014 02:06:12 -0800 (PST) Received: from localhost ([74.125.61.14]) by mx.google.com with ESMTPSA id r1sm34255874wia.5.2014.02.04.02.06.11 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 04 Feb 2014 02:06:11 -0800 (PST) From: Maxime Hadjinlian To: buildroot@busybox.net Date: Tue, 4 Feb 2014 11:06:05 +0100 Message-Id: <1391508365-30961-3-git-send-email-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1391508365-30961-1-git-send-email-maxime.hadjinlian@gmail.com> References: <1391508365-30961-1-git-send-email-maxime.hadjinlian@gmail.com> Subject: [Buildroot] [PATCH 3/3] dmraid: Update init script X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Fixes init script to uses current FOO_INSTALL_INIT_SYSV hooks. Signed-off-by: Maxime Hadjinlian --- package/dmraid/S20dmraid | 31 +++++++++++++++++++++++++++++++ package/dmraid/dmraid.init | 31 ------------------------------- package/dmraid/dmraid.mk | 8 ++++---- 3 files changed, 35 insertions(+), 35 deletions(-) create mode 100644 package/dmraid/S20dmraid delete mode 100644 package/dmraid/dmraid.init diff --git a/package/dmraid/S20dmraid b/package/dmraid/S20dmraid new file mode 100644 index 0000000..fd2ad9e --- /dev/null +++ b/package/dmraid/S20dmraid @@ -0,0 +1,31 @@ +#!/bin/sh + +set -e + +[ -x /usr/sbin/dmraid ] || exit 0 + +# try to load module in case that hasn't been done yet +modprobe dm-mod >/dev/null 2>&1 + +case "$1" in + start|"") + echo "Setting up DMRAID devices..." + /usr/sbin/dmraid --activate yes --ignorelocking --verbose + ;; + + stop) + echo "Shutting down DMRAID devices... " + /usr/sbin/dmraid --activate no --ignorelocking --verbose + ;; + + restart|force-reload) + $0 stop + sleep 1 + $0 start + ;; + + *) + echo "Usage: dmraid {start|stop|restart|force-reload}" + exit 1 + ;; +esac diff --git a/package/dmraid/dmraid.init b/package/dmraid/dmraid.init deleted file mode 100644 index fd2ad9e..0000000 --- a/package/dmraid/dmraid.init +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -set -e - -[ -x /usr/sbin/dmraid ] || exit 0 - -# try to load module in case that hasn't been done yet -modprobe dm-mod >/dev/null 2>&1 - -case "$1" in - start|"") - echo "Setting up DMRAID devices..." - /usr/sbin/dmraid --activate yes --ignorelocking --verbose - ;; - - stop) - echo "Shutting down DMRAID devices... " - /usr/sbin/dmraid --activate no --ignorelocking --verbose - ;; - - restart|force-reload) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "Usage: dmraid {start|stop|restart|force-reload}" - exit 1 - ;; -esac diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk index 089e33a..412c903 100644 --- a/package/dmraid/dmraid.mk +++ b/package/dmraid/dmraid.mk @@ -15,10 +15,10 @@ DMRAID_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install DMRAID_DEPENDENCIES = lvm2 -define DMRAID_INSTALL_INITSCRIPT - $(INSTALL) -m 0755 package/dmraid/dmraid.init $(TARGET_DIR)/etc/init.d/S20dmraid +define DMRAID_INSTALL_INIT_SYSV + [ -f $(TARGET_DIR)/etc/init.d/S20dmraid ] || \ + $(INSTALL) -D -m 0755 package/dmraid/S20dmraid \ + $(TARGET_DIR)/etc/init.d/S20dmraid endef -DMRAID_POST_INSTALL_TARGET_HOOKS += DMRAID_INSTALL_INITSCRIPT - $(eval $(autotools-package))