r226 - mdadm/trunk/debian

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-10-23 09:19:28 +0000 (Mon, 23 Oct 2006)
New Revision: 226

Modified:
   mdadm/trunk/debian/changelog
   mdadm/trunk/debian/control
   mdadm/trunk/debian/mdadm.postinst
   mdadm/trunk/debian/mdadm.postrm
Log:
* Now recommends module-init-tools.
* Hides ugly errors during configuration in the absense of module-init-tools
  or initramfs-tools.

Modified: mdadm/trunk/debian/changelog
===================================================================
--- mdadm/trunk/debian/changelog	2006-10-23 07:43:50 UTC (rev 225)
+++ mdadm/trunk/debian/changelog	2006-10-23 09:19:28 UTC (rev 226)
@@ -13,6 +13,9 @@
   * 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 at debian.org>  Mon, 23 Oct 2006 09:37:02 +0200
 

Modified: mdadm/trunk/debian/control
===================================================================
--- mdadm/trunk/debian/control	2006-10-23 07:43:50 UTC (rev 225)
+++ mdadm/trunk/debian/control	2006-10-23 09:19:28 UTC (rev 226)
@@ -10,7 +10,7 @@
 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)

Modified: mdadm/trunk/debian/mdadm.postinst
===================================================================
--- mdadm/trunk/debian/mdadm.postinst	2006-10-23 07:43:50 UTC (rev 225)
+++ mdadm/trunk/debian/mdadm.postinst	2006-10-23 09:19:28 UTC (rev 226)
@@ -13,7 +13,7 @@
 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 @@
       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
 

Modified: mdadm/trunk/debian/mdadm.postrm
===================================================================
--- mdadm/trunk/debian/mdadm.postrm	2006-10-23 07:43:50 UTC (rev 225)
+++ mdadm/trunk/debian/mdadm.postrm	2006-10-23 09:19:28 UTC (rev 226)
@@ -10,7 +10,7 @@
 
 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