- swsusp support from mis@pld-linux

[projects/geninitrd.git] / mod-dmraid.sh

diff --git a/mod-dmraid.sh b/mod-dmraid.sh
index be0b47a8179691c1021fcab7bf4ff0344eb2e6d2..2663a5b2683c1d62a16c7de3a9d34a8e29a7b892 100644 (file)
--- a/mod-dmraid.sh
+++ b/mod-dmraid.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
-#
 # geninitrd mod: dmraid
+USE_DMRAID=${USE_DMRAID:-yes}
 
 # if we should init dmraid at boot
 have_dmraid=no
@@ -9,9 +9,7 @@ have_dmraid=no
 # @access      public
 setup_mod_dmraid() {
        dmraid=$(find_tool $initrd_dir/dmraid /sbin/dmraid-initrd)
-       if [ -x /sbin/dmraid -a -x "$dmraid" ]; then
-               USE_DMRAID=yes
-       else
+       if [ ! -x /sbin/dmraid ] || [ ! -x "$dmraid" ]; then
                USE_DMRAID=no
        fi
 
@@ -68,6 +66,10 @@ find_modules_dmraid() {
 # generate initrd fragment for dmraid
 # @access      public
 initrd_gen_dmraid() {
+       if ! is_yes "$have_dmraid"; then
+               return
+       fi
+
        inst_d /sbin
        inst_exec $dmraid /sbin/dmraid