From 6c1b6e8221bc3633e7f4482856cd3740f01c7140 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 17 Oct 2017 09:28:39 -0700 Subject: mdadm: Fix config generation 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 [rewrap commit message] Signed-off-by: Jo-Philipp Wich (cherry picked from commit 8eadec40bdc205568e34e19b07b2a3035c9223fb) --- package/utils/mdadm/files/mdadm.init | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'package/utils/mdadm/files') 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() { -- cgit v1.2.3