[Dmraid-debian-commits] [SCM] Maintenance of the dmraid package branch, master, updated. debian/1.0.0.rc15-11-1-gaed3ea8

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit aed3ea80456c0ef28c7edb6a3ea3ce2d9bddeff3
Author: Tormod Volden <debian.tormod at gmail.com>
Date:   Mon Sep 7 22:39:15 2009 +0200

    Add support for "nodmraid" boot option
    
    With this option specified on the kernel cmdline, dmraid will not
    try to activate fakeraid arrays, and will therefore also not hide the
    partitions on the fakeraid member devices.
    
    This is to accommodate for certain (likely broken) corner cases.
    (Closes: #534274) (LP: #392510)

diff --git a/debian/dmraid-activate b/debian/dmraid-activate
index f2d510e..f609a9d 100644
--- a/debian/dmraid-activate
+++ b/debian/dmraid-activate
@@ -116,6 +116,11 @@ log_error()
 	fi
 }
 
+if grep -qs "\<nodmraid\>" /proc/cmdline; then
+	log_warning "dmraid disabled by boot option"
+	exit 0
+fi
+
 modprobe -q dm_mod
 
 if [ -z "$1" ] || [ "$1" = "--degraded" ] && [ "$#" -lt 2 ]; then

-- 
Maintenance of the dmraid package