diff options
| author | madduck <madduck@3cfab66f-1918-0410-86b3-c06b76f9a464> | 2006-12-19 08:18:50 +0000 |
|---|---|---|
| committer | madduck <madduck@3cfab66f-1918-0410-86b3-c06b76f9a464> | 2006-12-19 08:18:50 +0000 |
| commit | b82ce0c6d88d02eae029a2bfb17922cac9a43a2c (patch) | |
| tree | fdd959fdaff3d40d9878e1104f9b1a6523945694 | |
| parent | 06402eb87cdff4a5644375de962795482be86968 (diff) | |
* 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.
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/initramfs/hook | 4 | ||||
| -rw-r--r-- | debian/initramfs/script.local-top | 4 | ||||
| -rw-r--r-- | debian/mdadm-raid | 2 | ||||
| -rw-r--r-- | debian/mdadm.init | 2 | ||||
| -rw-r--r-- | debian/mdadm.preinst | 2 |
6 files changed, 15 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 5d7a9b79..ed0f0a02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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@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 diff --git a/debian/initramfs/hook b/debian/initramfs/hook index 235296c6..88ce0055 100644 --- a/debian/initramfs/hook +++ b/debian/initramfs/hook @@ -66,8 +66,8 @@ if [ -e /etc/initramfs-tools/hooks/md ]; then 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 diff --git a/debian/initramfs/script.local-top b/debian/initramfs/script.local-top index 22ccec4a..4856bab8 100644 --- a/debian/initramfs/script.local-top +++ b/debian/initramfs/script.local-top @@ -30,8 +30,8 @@ if [ -e /scripts/local-top/md ]; then exit 1 fi -MDADM=$(command -v mdadm) -[ -x $MDADM ] || exit 0 +MDADM=/sbin/mdadm +[ -x "$MDADM" ] || exit 0 verbose() { diff --git a/debian/mdadm-raid b/debian/mdadm-raid index 2dc9756c..2b1eac79 100644 --- a/debian/mdadm-raid +++ b/debian/mdadm-raid @@ -29,7 +29,7 @@ CONFIG=/etc/mdadm/mdadm.conf ALTCONFIG=/etc/mdadm.conf DEBIANCONFIG=/etc/default/mdadm -test -x $MDADM || exit 0 +test -x "$MDADM" || exit 0 AUTOSTART=true test -f $DEBIANCONFIG && . $DEBIANCONFIG diff --git a/debian/mdadm.init b/debian/mdadm.init index 570b10f3..580ec30a 100644 --- a/debian/mdadm.init +++ b/debian/mdadm.init @@ -28,7 +28,7 @@ RUNDIR=/var/run/mdadm PIDFILE=$RUNDIR/monitor.pid DEBIANCONFIG=/etc/default/mdadm -test -x $MDADM || exit 0 +test -x "$MDADM" || exit 0 test -f /proc/mdstat || exit 0 diff --git a/debian/mdadm.preinst b/debian/mdadm.preinst index 86182270..c5db6d30 100644 --- a/debian/mdadm.preinst +++ b/debian/mdadm.preinst @@ -19,7 +19,7 @@ case "$1" in 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 |