From 47bf25c62c0d7de4722dc101fe8bc31e99142f8e Mon Sep 17 00:00:00 2001 From: thomas Date: Fri, 11 May 2018 13:23:16 +0200 Subject: [PATCH 1/3] mxraid_assemble: Always perform system command Closes #44. --- mxraid/mxraid_assemble | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mxraid/mxraid_assemble b/mxraid/mxraid_assemble index 6c6328e..16e9d7f 100755 --- a/mxraid/mxraid_assemble +++ b/mxraid/mxraid_assemble @@ -298,7 +298,7 @@ sub create_mdadm_configs { my @args = ('mdadm', '-A', '/dev/md'.$dev_no, '-c', $conf_fn); push @args, split m/\s+/, $MDADM_ASSEMBLE_OPTIONS if $MDADM_ASSEMBLE_OPTIONS; warn printf "# NOTE: $rlabel, running '%s'\n", join(' ', @args) if $VERBOSE >= 2; - system (@args) == 0 or warn "# Error system @args failed: $?" if $VERBOSE >= 1; + system (@args) == 0 or warn "# Error system @args failed: $?"; # serious, always warn } else { printf "mdadm -A /dev/md%d -c %s\n", $dev_no, $conf_fn; } From 4a8a53ce027985d8918cab60480c5e48d377ed3f Mon Sep 17 00:00:00 2001 From: thomas Date: Fri, 11 May 2018 13:24:31 +0200 Subject: [PATCH 2/3] mxraid_assemble: Fix print command --- mxraid/mxraid_assemble | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mxraid/mxraid_assemble b/mxraid/mxraid_assemble index 16e9d7f..8738a59 100755 --- a/mxraid/mxraid_assemble +++ b/mxraid/mxraid_assemble @@ -297,7 +297,7 @@ sub create_mdadm_configs { if ($do_assemble) { my @args = ('mdadm', '-A', '/dev/md'.$dev_no, '-c', $conf_fn); push @args, split m/\s+/, $MDADM_ASSEMBLE_OPTIONS if $MDADM_ASSEMBLE_OPTIONS; - warn printf "# NOTE: $rlabel, running '%s'\n", join(' ', @args) if $VERBOSE >= 2; + warn sprintf "# NOTE: $rlabel, running '%s'\n", join(' ', @args) if $VERBOSE >= 2; system (@args) == 0 or warn "# Error system @args failed: $?"; # serious, always warn } else { printf "mdadm -A /dev/md%d -c %s\n", $dev_no, $conf_fn; From 550576bb7b5b9bf4b3c3999133e423d427046dee Mon Sep 17 00:00:00 2001 From: thomas Date: Fri, 11 May 2018 13:28:31 +0200 Subject: [PATCH 3/3] mxraid_assemble: Improve disk listing Should avoid misunderstandings. --- mxraid/mxraid_assemble | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mxraid/mxraid_assemble b/mxraid/mxraid_assemble index 8738a59..1cb8310 100755 --- a/mxraid/mxraid_assemble +++ b/mxraid/mxraid_assemble @@ -120,7 +120,7 @@ if ($opts{l}) { print "\n"; } if ($VERBOSE >= 2) { - print "Disks not part of a SW-RAID:\n"; + print "Disks not part of a configured SW-RAID:\n"; for my $rec (@{$hd->non_raid_disks()}) { printf " %5s %-16s '%s'\n", @$rec; }