diff options
| author | madduck <madduck@3cfab66f-1918-0410-86b3-c06b76f9a464> | 2006-10-23 09:19:28 +0000 |
|---|---|---|
| committer | madduck <madduck@3cfab66f-1918-0410-86b3-c06b76f9a464> | 2006-10-23 09:19:28 +0000 |
| commit | 6d5c823d1e4fbcd1b18aa89518d6d7f437c6ef4c (patch) | |
| tree | 2fba040f27172f14a79b59edbd754fecb9642167 /debian | |
| parent | 4c923c2f8fcf8c4a992a9ce2e643399a4cbb2f2a (diff) | |
* Now recommends module-init-tools.
* Hides ugly errors during configuration in the absense of module-init-tools
or initramfs-tools.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/mdadm.postinst | 4 | ||||
| -rw-r--r-- | debian/mdadm.postrm | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 68e968de..95d3c338 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,9 @@ mdadm (2.5.5-1~unreleased.1) UNRELEASED; urgency=low * Added FAQ entries about partitionable arrays. * chroot detection now also works for 2.6.18 and beyond (c.f. kernel commit 778c1144771f0064b6f51bee865cceb0d996f2f9). + * Now recommends module-init-tools. + * Hides ugly errors during configuration in the absense of module-init-tools + or initramfs-tools. -- martin f. krafft <madduck@debian.org> Mon, 23 Oct 2006 09:37:02 +0200 diff --git a/debian/control b/debian/control index 51201966..5aa46687 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ XS-Vcs-Svn: svn://svn.debian.org/pkg-mdadm/mdadm/trunk Package: mdadm Architecture: any Depends: ${shlibs:Depends}, makedev, ${misc:Depends}, lsb-base (>= 3.1-6), debconf (>= 1.4.72) -Recommends: mail-transport-agent +Recommends: mail-transport-agent, module-init-tools Replaces: mdctl Conflicts: mdctl (<< 0.7.2), raidtools2 (<< 1.00.3-12.1), initramfs-tools (<< 0.65) Description: tool to administer Linux MD arrays (software RAID) diff --git a/debian/mdadm.postinst b/debian/mdadm.postinst index cef8389b..ebdf1110 100644 --- a/debian/mdadm.postinst +++ b/debian/mdadm.postinst @@ -13,7 +13,7 @@ set -eu case "${1:-}" in configure|reconfigure) - if [ ! -f /proc/mdstat ] && [ -x $(command -v modprobe) ]; then + if [ ! -f /proc/mdstat ] && [ -x $(command -v modprobe 2>/dev/null) ]; then modprobe -k md >/dev/null 2>&1 || : fi if [ ! -f /proc/mdstat ]; then @@ -149,7 +149,7 @@ _eof fi fi - command -v update-initramfs >/dev/null && update-initramfs -u -k all + command -v update-initramfs >/dev/null 2>&1 && update-initramfs -u -k all ;; esac diff --git a/debian/mdadm.postrm b/debian/mdadm.postrm index 01c5dc67..fc5a06fa 100644 --- a/debian/mdadm.postrm +++ b/debian/mdadm.postrm @@ -10,7 +10,7 @@ set -eu case "${1:-}" in remove) - if command -v update-initramfs >/dev/null; then + if command -v update-initramfs >/dev/null 2>&1; then echo "W: mdadm: I'll update the initramfs, but if you need MD to boot" >&2 echo "W: mdadm: with initramfs, you'll be screwed!" >&2 update-initramfs -u -k all |