From patchwork Fri Mar 20 23:35:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1259265 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.136; helo=silver.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=dMqXkVX7; 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 48kgC34k64z9sPk for ; Sat, 21 Mar 2020 10:36:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D9EA926FCD; Fri, 20 Mar 2020 23:36:13 +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 qVhy-UixRZL9; Fri, 20 Mar 2020 23:36:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 1A87E263A6; Fri, 20 Mar 2020 23:36:12 +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 B0AB61BF59A for ; Fri, 20 Mar 2020 23:36:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 974C4263A6 for ; Fri, 20 Mar 2020 23:36:09 +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 Kp16It1PkfEQ for ; Fri, 20 Mar 2020 23:36:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by silver.osuosl.org (Postfix) with ESMTPS id 9DCC126307 for ; Fri, 20 Mar 2020 23:36:08 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id z12so6609065qtq.5 for ; Fri, 20 Mar 2020 16:36:08 -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=dMqXkVX7+2E3pw7riNbvRqa8b/3in9KHqRp7H5A09Uqkpmf0xJQfPj7MqWB3gEfllT kdLhGp3D+78bAxNf057uBFX8I+HpUace9P9JgOa4TL4AkEs45Bh46Q5tBP9FQ1G9OlQY cYx9X8n8X+KJtnx/SLw4iQh3vTYddEbj4g47JHepU+OMMyCOlC/gZl6wiu1d5yUCuq+v bPkdL9fulCVA/ZLyf8msSLSaL9k0HqryWWeY17VAla+bIHVe8n053RKRLxGg9CNIYmgK fZxqTmpPHI9ig5eV/vSMpFvW0SEwR509K6AHF8NZhiIQ7wFCMhMakQtRFBIUbXe8+9NI UZ3A== 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=JQzuNFeWgxajht6hRAlegsSpkkwFSb7P1hy9Ag062zqEygx5Msn+66nB7OMVw8BjwE o+agXTWvnlON69X1nuGLHb4AtBiW3VMGzn8tlxiVem0T0QX6/n4+M/apf2DBTDd6V13v aYtf7MCCskbYj5prCc7HXNisVxZJJHDqKb99Vv2QI9BoQwIJEhQapaSXumgUk5eQgOe9 FxB7kkvjFc9kFtGfz/sHMg+pj0twnvTSSa3Yp51pbG7mz6lzyL7V6MqaJlE+ELvovpQM ixiVNx4yVyPIjeN12EMfLYYSAyY/3nKMX13OPo7oYLspw0meM9n0Dfzp9scaMKG+zkkH pgVA== X-Gm-Message-State: ANhLgQ2D0whaRmM3DFA1M4IZsQbHrn5V5m2lBStijIL9Q+1lnzf/cpJ9 bFw2QR/OAaoLoHOVBvDXqJfUbeAfitU= X-Google-Smtp-Source: ADFU+vtQym1fl7XKqwRSmhOXj6cJhH8l6eUugs3PTcIQbiIxc9SHGrsn5QD7j8PWEiO85jbpzEvT0g== X-Received: by 2002:ac8:7a9a:: with SMTP id x26mr11119049qtr.137.1584747367379; Fri, 20 Mar 2020 16:36:07 -0700 (PDT) Received: from casantos.remote.com (177.204.229.175.dynamic.adsl.gvt.net.br. [177.204.229.175]) by smtp.gmail.com with ESMTPSA id p38sm6265257qtf.50.2020.03.20.16.36.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 16:36:06 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Fri, 20 Mar 2020 20:35:45 -0300 Message-Id: <20200320233547.28586-5-unixmania@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200320233547.28586-1-unixmania@gmail.com> References: <20200320233547.28586-1-unixmania@gmail.com> Subject: [Buildroot] [[PATCH RFC] 4/6] 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 , Lothar Felten , Adam Duskett 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))