martin f. krafft: we ought to be able to rely on autoloading of the module

[Martin F. Krafft]

Module: mdadm
Branch: incremental
Commit: 6fe0263645e496c3bca166f1e044282ec630bc0e
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=6fe0263645e496c3bca166f1e044282ec630bc0e

Author: martin f. krafft <madduck at debian.org>
Date:   Fri Jan 29 17:03:55 2010 +1300

we ought to be able to rely on autoloading of the module

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

---

 debian/initramfs/script.init-top  |   33 ---------------------------------
 debian/initramfs/script.local-top |    5 -----
 debian/rules                      |    2 --
 3 files changed, 0 insertions(+), 40 deletions(-)

diff --git a/debian/initramfs/script.init-top b/debian/initramfs/script.init-top
deleted file mode 100644
index aa89804..0000000
--- a/debian/initramfs/script.init-top
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# Copyright © 2010 Martin F. Krafft <madduck at debian.org>
-# based on the scripts in the initramfs-tools package.
-# released under the terms of the Artistic Licence 2.0.
-#
-set -eu
-
-. /scripts/functions
-
-case ${1:-} in
-  prereqs) exit 0;;
-esac
-
-verbose()
-{
-  case "$quiet" in y*|Y*|1|t*|T*)
-    return 1;;
-  *)
-    return 0;;
-  esac
-}
-
-if [ -e /proc/modules ]; then
-  verbose && log_begin_msg Loading MD module
-  if modprobe -q md_mod; then
-    verbose && log_success_msg "loaded MD module."
-  else
-    log_failure_msg "failed to load MD module (md_mod)."
-  fi
-fi
-
-exit 0
diff --git a/debian/initramfs/script.local-top b/debian/initramfs/script.local-top
index b23ef82..4d11eb9 100644
--- a/debian/initramfs/script.local-top
+++ b/debian/initramfs/script.local-top
@@ -36,11 +36,6 @@ case ${1:-} in
   prereqs) echo "multipath"; exit 0;;
 esac
 
-if [ ! -f /proc/mdstat ]; then
-  verbose && panic "MD subsystem is not initialised (/proc/mdstat missing)"
-  exit 1
-fi
-
 DEBIANCONFIG=/etc/default/mdadm
 [ -s $DEBIANCONFIG ] && . $DEBIANCONFIG
 [ -s /conf/conf.d/md ] && . /conf/conf.d/md
diff --git a/debian/rules b/debian/rules
index 6c588cb..51cb59a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,8 +75,6 @@ install: build $(INTERPOLATED_FILES)
 		$(DESTDIR)/usr/share/initramfs-tools/hooks/mdadm
 	install -m0755 debian/initramfs/script.local-top \
 		$(DESTDIR)/usr/share/initramfs-tools/scripts/local-top/mdadm
-	install -m0755 debian/initramfs/script.init-top \
-		$(DESTDIR)/usr/share/initramfs-tools/scripts/init-top/mdadm
 
 	install -m0755 debian/mkconf $(DESTDIR)/usr/share/mdadm
 	install -m0755 debian/checkarray $(DESTDIR)/usr/share/mdadm