From patchwork Sat Apr 18 22:14:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1272741 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=fGYGAnUj; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 494S1S4qblz9sRN for ; Sun, 19 Apr 2020 08:14:36 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D5EFA87120; Sat, 18 Apr 2020 22:14:31 +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 5rKqKoLpIBKy; Sat, 18 Apr 2020 22:14:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 70D588762A; Sat, 18 Apr 2020 22:14:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 6588B1BF577 for ; Sat, 18 Apr 2020 22:14:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5E3F220108 for ; Sat, 18 Apr 2020 22:14:27 +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 r+NTLmJ8Q0bQ for ; Sat, 18 Apr 2020 22:14:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by silver.osuosl.org (Postfix) with ESMTPS id A406F20035 for ; Sat, 18 Apr 2020 22:14:26 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id f13so5373397qti.5 for ; Sat, 18 Apr 2020 15:14:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xPkHLBk76154qMCVdQR1WJqsaorvL/JgfV7aQWabstE=; b=fGYGAnUjT/Oj5jE7AMtRNBOGZkdAVuoV8XuKydCEmxi94nJ5p2zC62+7NPxjb368cW cjAw3ZDdUQNLZ00cQvWeMG2npXOWl0/xDg2m6WPqL3xk0utv7KUEni8DK3XV5GHoeIr9 ehlu458EzBZGQ7JzklKwjT0HByO6UcNFp06Z3rJwitCDFsQ/wwybfJciOZCicVlQbaHk PQHoU4QbA3VJBYUBrNiDEFk5sWRbQV5/PAvOVx+zXFYgwvuVxqEI6DAhtiWVpH13StpX XGV+497vDAtP72SxOWGSGykQLRsjY9BODzh5jooux9fZJl396AMYfG4ETJcUOoZDfNwX WnmA== 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=xPkHLBk76154qMCVdQR1WJqsaorvL/JgfV7aQWabstE=; b=cOrUS2p/6gYKyOBzlXYpPAZ9VJgimgWSKPI/OP1/TmdmYIUeyuakUZQbj1ATHaLrrk A0+5xVbujUTlWagiaj8lYyI67cK+TvMQD4R08xe0y6UBKymz/hB5Qgx7nBk8mL6uDYjC C9bcXgNUrH9xGg8rbqUSGxPcCDaqRBIQThPoXPdJlA1HxkesdvdZ0ADxA9ydkpfL1aLK 1teGWfMRoKGSoxWWLmtwJ10g0RhNUTTHtJ6F5SqFIKgEBuR7kFgVLrRHnyN+PE866O0b OR048g9polxlFCl/17dbYqhyjQEc2pX/uXzJq9HQ6rGtUEyvEF2tt3nJDLYeYtsk1k1F kTAQ== X-Gm-Message-State: AGi0PuZCy4Jeain2YkNMCuRBiOGuP2M4Na6gOxgKM2GCC3f+1RFprHql y4QVZCS5i4PrikAZlIfvqqOCVCH2mj4= X-Google-Smtp-Source: APiQypLkAXFccg6bGnZ09Dr0glIUGKY4OZIE8nPYvLDe73bFvJSNPwxfRi1PnBGRreEvhfvgmKXjmA== X-Received: by 2002:ac8:46c9:: with SMTP id h9mr9663446qto.128.1587248065406; Sat, 18 Apr 2020 15:14:25 -0700 (PDT) Received: from casantos.remote.csb.com (189.27.141.225.dynamic.adsl.gvt.net.br. [189.27.141.225]) by smtp.gmail.com with ESMTPSA id h3sm5335252qkf.15.2020.04.18.15.14.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 15:14:24 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Sat, 18 Apr 2020 19:14:09 -0300 Message-Id: <20200418221411.1549783-4-unixmania@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200418221411.1549783-1-unixmania@gmail.com> References: <20200418221411.1549783-1-unixmania@gmail.com> Subject: [Buildroot] [PATCH v2 3/5] package/dmraid: use modules-load to load the kernel module 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: Carlos Santos , Adam Duskett , Lothar Felten MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos This is compatible with BusyBox/sysvinit (via S02modules-load), OpenRC and systemd. It also prevents trying to load the module each time the init script is executed. Signed-off-by: Carlos Santos --- Tested on QEMU with a kernel config with MD=y and DM_=m. Only the module loading was tested, since there is no RAID device. --- package/dmraid/S20dmraid | 3 --- package/dmraid/dmraid.mk | 12 ++++++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/package/dmraid/S20dmraid b/package/dmraid/S20dmraid index b3bfdcc84b..ff325154c6 100644 --- a/package/dmraid/S20dmraid +++ b/package/dmraid/S20dmraid @@ -2,9 +2,6 @@ set -e -# 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..." diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk index 0382cd4d99..c8facbdabd 100644 --- a/package/dmraid/dmraid.mk +++ b/package/dmraid/dmraid.mk @@ -21,4 +21,16 @@ define DMRAID_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S20dmraid endef +ifeq ($(BR2_LINUX_KERNEL),y) +define DMRAID_GEN_MODULES_CONF + $(INSTALL) -d -m 755 $(TARGET_DIR)/etc/modules-load.d + { \ + find $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/md -name 'dm[_-]mod.ko*'; \ + } 2> /dev/null | { \ + sed 's:^.*/::; s:\.ko[^ ]*::'; \ + } > $(TARGET_DIR)/etc/modules-load.d/20-dmraid.conf +endef +DMRAID_TARGET_FINALIZE_HOOKS += DMRAID_GEN_MODULES_CONF +endif + $(eval $(autotools-package))