diff -u dmraid-1.0.0.rc15/debian/changelog dmraid-1.0.0.rc15/debian/changelog
--- dmraid-1.0.0.rc15/debian/changelog
+++ dmraid-1.0.0.rc15/debian/changelog
@@ -1,3 +1,16 @@
+dmraid (1.0.0.rc15-11ubuntu1) karmic; urgency=low
+
+  * debian/dmraid-activate: Remove the special-casing of the root
+    device which breaks in many situations and leaves the raw devices
+    exposed. This was introduced in Debian to accommodate some broken
+    configurations which wanted to access "partitions" on the raid
+    raw devices. In Ubuntu, broken configurations has not been supported.
+  * debian/dmraid-activate: Add support for "nodmraid" boot option, which
+    prevents automatic detection and activation of dmraid arrays. Useful
+    for broken configurations...  Picked from Debian git. (LP: #392510)
+
+ -- Tormod Volden <debian.tormod@gmail.com>  Fri, 25 Sep 2009 21:29:36 +0200
+
 dmraid (1.0.0.rc15-11build1) karmic; urgency=low
 
   * Fakesync from Debian
diff -u dmraid-1.0.0.rc15/debian/dmraid-activate dmraid-1.0.0.rc15/debian/dmraid-activate
--- dmraid-1.0.0.rc15/debian/dmraid-activate
+++ dmraid-1.0.0.rc15/debian/dmraid-activate
@@ -67,34 +67,7 @@
 
 	# At this point we have the required number of devs, or the user wants the
 	# array brought up in degraded mode, except in the case of striped arrays.
-	# We need to know the root device for determining if the -Z flag can be used 
-	# (see #533848 and LP: 392510)
-	if [ -z "$ROOT" ]; then
-		for x in $(cat /proc/cmdline); do
-			case $x in
-				root=*)
-				ROOT=${x#root=}
-				;;
-			esac
-		done
-		case "$ROOT" in
-			LABEL=*)
-			ROOT=$(readlink -f /dev/disk/by-uuid/${ROOT#LABEL=})
-			;;
-			UUID=*)
-			ROOT=$(readlink -f /dev/disk/by-uuid/${ROOT#UUID=})
-			;;
-		esac
-	else
-		ROOT=$(readlink -f $ROOT)
-	fi
-	
-	if (echo $ROOT | grep -q $1) ; then
-		dmraid -i -ay -Z "$1"
-	else
-		dmraid -i -ay "$1"
-	fi
-	
+	dmraid -i -ay -Z "$1"
 	return $Return_Val
 }
 
@@ -116,6 +89,11 @@
 	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