r290 - in mdadm/trunk/debian: . initramfs

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-12-19 09:18:50 +0100 (Tue, 19 Dec 2006)
New Revision: 290

Modified:
   mdadm/trunk/debian/changelog
   mdadm/trunk/debian/initramfs/hook
   mdadm/trunk/debian/initramfs/script.local-top
   mdadm/trunk/debian/mdadm-raid
   mdadm/trunk/debian/mdadm.init
   mdadm/trunk/debian/mdadm.preinst
Log:
* Hard-code path to /sbin/mdadm binary rather than searching the $PATH. This
  closes: #403307 and should be a little more robust in the presence of
  installations of mdadm in /usr/local.

Modified: mdadm/trunk/debian/changelog
===================================================================
--- mdadm/trunk/debian/changelog	2006-12-13 14:38:25 UTC (rev 289)
+++ mdadm/trunk/debian/changelog	2006-12-19 08:18:50 UTC (rev 290)
@@ -1,3 +1,11 @@
+mdadm (2.5.6-8) unstable; urgency=low
+
+  * Hard-code path to /sbin/mdadm binary rather than searching the $PATH. This
+    closes: #403307 and should be a little more robust in the presence of
+    installations of mdadm in /usr/local.
+
+ -- martin f. krafft <madduck at debian.org>  Sat, 16 Dec 2006 16:20:36 +0100
+
 mdadm (2.5.6-7) unstable; urgency=low
 
   * Only parse ARRAY lines from configuration file when collecting the array

Modified: mdadm/trunk/debian/initramfs/hook
===================================================================
--- mdadm/trunk/debian/initramfs/hook	2006-12-13 14:38:25 UTC (rev 289)
+++ mdadm/trunk/debian/initramfs/hook	2006-12-19 08:18:50 UTC (rev 290)
@@ -66,8 +66,8 @@
   exit 0
 fi
 
-MDADM=$(command -v mdadm 2>/dev/null) || :
-[ -x $MDADM ] || exit 0
+MDADM=/sbin/mdadm
+[ -x "$MDADM" ] || exit 0
 
 [ -r /usr/share/initramfs-tools/hook-functions ] || exit 0
 . /usr/share/initramfs-tools/hook-functions

Modified: mdadm/trunk/debian/initramfs/script.local-top
===================================================================
--- mdadm/trunk/debian/initramfs/script.local-top	2006-12-13 14:38:25 UTC (rev 289)
+++ mdadm/trunk/debian/initramfs/script.local-top	2006-12-19 08:18:50 UTC (rev 290)
@@ -30,8 +30,8 @@
   exit 1
 fi
 
-MDADM=$(command -v mdadm)
-[ -x $MDADM ] || exit 0
+MDADM=/sbin/mdadm
+[ -x "$MDADM" ] || exit 0
 
 verbose()
 {

Modified: mdadm/trunk/debian/mdadm-raid
===================================================================
--- mdadm/trunk/debian/mdadm-raid	2006-12-13 14:38:25 UTC (rev 289)
+++ mdadm/trunk/debian/mdadm-raid	2006-12-19 08:18:50 UTC (rev 290)
@@ -29,7 +29,7 @@
 ALTCONFIG=/etc/mdadm.conf
 DEBIANCONFIG=/etc/default/mdadm
 
-test -x $MDADM || exit 0
+test -x "$MDADM" || exit 0
 
 AUTOSTART=true
 test -f $DEBIANCONFIG && . $DEBIANCONFIG

Modified: mdadm/trunk/debian/mdadm.init
===================================================================
--- mdadm/trunk/debian/mdadm.init	2006-12-13 14:38:25 UTC (rev 289)
+++ mdadm/trunk/debian/mdadm.init	2006-12-19 08:18:50 UTC (rev 290)
@@ -28,7 +28,7 @@
 PIDFILE=$RUNDIR/monitor.pid
 DEBIANCONFIG=/etc/default/mdadm
 
-test -x $MDADM || exit 0
+test -x "$MDADM" || exit 0
 
 test -f /proc/mdstat || exit 0
 

Modified: mdadm/trunk/debian/mdadm.preinst
===================================================================
--- mdadm/trunk/debian/mdadm.preinst	2006-12-13 14:38:25 UTC (rev 289)
+++ mdadm/trunk/debian/mdadm.preinst	2006-12-19 08:18:50 UTC (rev 290)
@@ -19,7 +19,7 @@
     fi
 
     # save the v1 output of -Es just in case we need it for upgrades
-    MDADM="$(command -v mdadm 2>/dev/null || :)"
+    MDADM=/sbin/mdadm
     if [ -x "$MDADM" ] && [ -n "${2:-}" ] && \
         dpkg --compare-versions $2 lt 2; then
       echo DEVICE partitions > /var/backups/mdadm-Es_v1.dump