From patchwork Fri Oct 6 08:28:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 822269 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="NCmOO89P"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="peXMcabG"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y7jVL0d4Hz9t4b for ; Fri, 6 Oct 2017 19:29:30 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=t7LmpKB2xr6lzDTRZiNYJyOda3YXrf4CysyduSweIkw=; b=NCmOO89P8PFIdv NYL2zKruXQ0dzXFduEEDwGhuRJ4sCHs1LEIu9p/c5+l4IyARlI+0bBuVlka93YkrZJZK8C9GCHveJ 9UHcOBVDbpHLc4zcSmZIsMFRB2NzM+pyhoNNDvSo8M9d2iJClFHHCbi2cGUqn7Gbc1Bh6+hllivkB 7r898lpCOlsK865FjFJW47PbGTGuqQmye1/jvjt3a7z5z8hDgT6+aiQamIGx7XxnwFsVXvwzAgEPs 4SL9nNZXvzAbSG2svN8PhnXIyXhS3pJGmvBcO7E3oP7Ij35B/0UKnxVP9EUfYvRKZKZtmXV5Gk6B5 yivWE3Abp0FCrYC3K7Uw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e0O0a-0005za-To; Fri, 06 Oct 2017 08:29:24 +0000 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e0O0X-0005qF-Km for lede-dev@lists.infradead.org; Fri, 06 Oct 2017 08:29:23 +0000 Received: by mail-pf0-x242.google.com with SMTP id i23so16291892pfi.2 for ; Fri, 06 Oct 2017 01:29:01 -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; bh=XbXz6BEH29+bnbUpubzmz/FfvPmbiwVbUZ0YCpZQR4s=; b=peXMcabGeJYmNQ9JiUjyV3meMtEMcq83oCBkr2rswuxdvY/iAbbNkPOgDXI1eEcgme VRq5zTiEOo35SUF0lxzCFtnYOBnrT6WQgaRWqybGHAYhj86SDgfeo3bzlLDfCKjVXw5E vYf+7M6+pMgw7sNn1UcToe8wvPibyRtYAC5YbTXAlt34bizM05zCeqy1WA/YZzA0YKBj gDx+n263C6j0kq8zGVcJbzlW3JNb3cXijXZXURZyYNuF2iPn0sdtvqoR6qe5CjJueE3z ZQ0MOUmccntW288MgvgioC6c7a8Fytwl/t35NFIP/9c3AYNZ1pAJHZICfrLodiVnH/6u xH9A== 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; bh=XbXz6BEH29+bnbUpubzmz/FfvPmbiwVbUZ0YCpZQR4s=; b=o7c0rx+16IQ/pFLfdh4qo0A/traSx4VpvqLqThSZI5V5/B4nbssj0AXZr+wxiFG8t7 57KgAeGg1giRyE3Zs8AFGRvbwilYlbAYIjW3O7x8dadlnsbtyQGuPGMXdIldQbpp2jKY u5srq01khpDeKzvTpe7XJl1wXv2neEAlpgROA0n+bpxZCYCAwXCg8p5TkKHdhaqAEIfi 48+Mh7eUvtrYknuEQLtIoBixXIoZ77x3P8DbuVmtK1ro8sLBNGXLbJc7f11rSSSDHOOt ylqpKDJcFfbxtzMKR/aRg0ruXvD5CubiZJ6t3EyMxtZWw9Tv5GkDRmUinUMEXtJFYGZC zYEg== X-Gm-Message-State: AMCzsaW76xDwryZiurU7oGDe11MaJ+vZloei/7GGS93XwJ8vFpftWx7l O8t2JTXuTzbHqMYDRhLXETw7ap3X X-Google-Smtp-Source: AOwi7QAlVAsf/veukc0juAGcVYg58zjSPGENkGO73RG5kqZ9UfwldZbF6rs+wyqxDCsxwHgNB0d4ig== X-Received: by 10.99.96.70 with SMTP id u67mr1326402pgb.361.1507278540545; Fri, 06 Oct 2017 01:29:00 -0700 (PDT) Received: from mangix.lan ([2001:470:1f05:c3e:15b4:38aa:75de:f661]) by smtp.gmail.com with ESMTPSA id z89sm2006847pff.21.2017.10.06.01.28.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Oct 2017 01:28:59 -0700 (PDT) From: Rosen Penev To: lede-dev@lists.infradead.org Date: Fri, 6 Oct 2017 01:28:52 -0700 Message-Id: <20171006082852.19799-1-rosenp@gmail.com> X-Mailer: git-send-email 2.13.6 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171006_012921_738450_A467D538 X-CRM114-Status: GOOD ( 12.82 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400e:c00:0:0:0:242 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (rosenp[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [LEDE-DEV] [PATCH] mdadm: Fix config generation X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rosen Penev MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The init script generated something like "DEVICE=/dev/sda" when it should have been generating "DEVICE /dev/sda". mdadm errors on this. Patch by jow. Also changed the default sendmail path to /usr/sbin/sendmail. No package in LEDE provides /sbin/sendmail. msmtp provides /usr/sbin/sendmail so use that. Also add a patch to fix file paths for mdadm runtime files. mdadm currently errors on them since /run is missing. Once /run is added to stock LEDE, this patch can be removed. Signed-off-by: Rosen Penev --- package/utils/mdadm/Makefile | 2 +- package/utils/mdadm/files/mdadm.init | 11 ++++---- .../utils/mdadm/patches/201-Fix-directories.patch | 31 ++++++++++++++++++++++ 3 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 package/utils/mdadm/patches/201-Fix-directories.patch diff --git a/package/utils/mdadm/Makefile b/package/utils/mdadm/Makefile index 1ed62d8174..5b2aa8e172 100644 --- a/package/utils/mdadm/Makefile +++ b/package/utils/mdadm/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mdadm PKG_VERSION:=4.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_URL:=@KERNEL/linux/utils/raid/mdadm PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz diff --git a/package/utils/mdadm/files/mdadm.init b/package/utils/mdadm/files/mdadm.init index e6624a776e..64a50b35de 100644 --- a/package/utils/mdadm/files/mdadm.init +++ b/package/utils/mdadm/files/mdadm.init @@ -34,14 +34,13 @@ mdadm_common() { local cfg="$1" local email devices - if [ -x /sbin/sendmail ]; then - append_option email "$cfg" email "MAILADDR" - + if [ -x /usr/sbin/sendmail ]; then + config_get email "$cfg" email + [ -n "$email" ] && printf "MAILADDR %s\n" "$email" >> $CONF fi - append_option devices "$cfg" devices DEVICE " " - - printf "%s\n%s\n" "$email" "$devices" >> $CONF + config_list_foreach "$cfg" devices append_list_item devices " " + [ -n "$devices" ] && printf "DEVICE %s\n" "$devices" >> $CONF } mdadm_array() { diff --git a/package/utils/mdadm/patches/201-Fix-directories.patch b/package/utils/mdadm/patches/201-Fix-directories.patch new file mode 100644 index 0000000000..c795441b27 --- /dev/null +++ b/package/utils/mdadm/patches/201-Fix-directories.patch @@ -0,0 +1,31 @@ +diff --git a/mdadm.h b/mdadm.h +index 71b8afb..1d8fca3 100644 +--- a/mdadm.h ++++ b/mdadm.h +@@ -103,7 +103,7 @@ struct dlm_lksb { + * /run seems to have emerged as the best standard. + */ + #ifndef MAP_DIR +-#define MAP_DIR "/run/mdadm" ++#define MAP_DIR "/tmp/run/mdadm" + #endif /* MAP_DIR */ + /* MAP_FILE is what we name the map file we put in MAP_DIR, in case you + * want something other than the default of "map" +@@ -120,7 +120,7 @@ struct dlm_lksb { + * boot process and stays up as long as possible during shutdown. + */ + #ifndef MDMON_DIR +-#define MDMON_DIR "/run/mdadm" ++#define MDMON_DIR "/tmp/run/mdadm" + #endif /* MDMON_DIR */ + + /* FAILED_SLOTS is where to save files storing recent removal of array +@@ -128,7 +128,7 @@ struct dlm_lksb { + * slot for array recovery + */ + #ifndef FAILED_SLOTS_DIR +-#define FAILED_SLOTS_DIR "/run/mdadm/failed-slots" ++#define FAILED_SLOTS_DIR "/tmp/run/mdadm/failed-slots" + #endif /* FAILED_SLOTS */ + + #include "md_u.h"