Cristian Ionescu-Idbohrn: Remove extra -x check for mdadm binary

Martin F. Krafft madduck at alioth.debian.org
Mon Apr 27 07:59:13 UTC 2009


Module: mdadm
Branch: master
Commit: 49cb52254ed79d5d6b1550613417520297c0fbf6
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=49cb52254ed79d5d6b1550613417520297c0fbf6

Author: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn at axis.com>
Date:   Mon Apr 27 09:53:08 2009 +0200

Remove extra -x check for mdadm binary

Signed-off-by: martin f. krafft <madduck at debian.org>

---

 debian/initramfs/hook |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/debian/initramfs/hook b/debian/initramfs/hook
index 8c8d4fb..6e6066d 100644
--- a/debian/initramfs/hook
+++ b/debian/initramfs/hook
@@ -231,16 +231,14 @@ if [ "$INITRDSTART" != none ] && [ -n "$devpairs" ]; then
   done
 
   # see if /etc/mdadm/mdadm.conf looks like it's missing devices
-  if [ -x $MDADM ]; then
-    $MDADM --detail --scan | while read array device rubbish; do
-      if ! echo $devpairs | grep -qw $device; then
-        warn "You appear to be missing $device from /etc/mdadm/mdadm.conf !"
-        warn "If this array is required to boot, you must add the following line:"
-        rubbish=`echo $rubbish | sed 's/metadata=[^ ]* //'`
-        warn "$array $device $rubbish"
-      fi
-    done
-  fi
+  $MDADM --detail --scan | while read array device rubbish; do
+    if ! echo $devpairs | grep -qw $device; then
+      warn "You appear to be missing $device from /etc/mdadm/mdadm.conf !"
+      warn "If this array is required to boot, you must add the following line:"
+      rubbish=`echo $rubbish | sed 's/metadata=[^ ]* //'`
+      warn "$array $device $rubbish"
+    fi
+  done
 
   for i in $INITRDSTART; do
     case "$INITRDSTART" in all|none|'') break;; *) :;; esac




More information about the pkg-mdadm-commits mailing list