[Dmraid-debian-commits] [SCM] Maintenance of the dmraid package branch, master, updated. debian/1.0.0.rc15-6-4-g18ece89

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit 18ece89a0cbbe3cd4d0fdcece41fc2695db45947
Author: Giuseppe Iuculano <giuseppe at iuculano.it>
Date:   Wed Apr 22 11:17:00 2009 +0200

    debian/dmraid-activate: grep also for "formats discovered" when assign Raid_Name, and do not use "cut" to assign Isw_Group_Name. In this way dmraid-activate works also for user having multiple metadata signatures and/or not using initramfs. (Closes: #523660)

diff --git a/debian/dmraid-activate b/debian/dmraid-activate
index 56684fc..dc5cecd 100644
--- a/debian/dmraid-activate
+++ b/debian/dmraid-activate
@@ -103,7 +103,7 @@ else
 	Node_Name=$1
 fi
 
-Raid_Name=$(dmraid -i -r -cr /dev/$Node_Name | grep -vi "No RAID disks")
+Raid_Name=$(dmraid -i -r -cr /dev/$Node_Name | grep -vi "No RAID disks" | grep -vi "formats discovered")
 
 if [ -z "$Raid_Name" ]; then
 	exit 0
@@ -113,7 +113,7 @@ fi
 # subsets of a RAID group, of varying RAID types.
 case "$Raid_Name" in
 	isw_*)
-		Isw_Group_Name=$(echo "$Raid_Name" | cut -f 1-2 -d _)
+		Isw_Group_Name=$Raid_Name
 		Isw_Subsets=$(dmraid -i -n "/dev/$Node_Name" | grep volume | sed 's/.*volume: " *\(.*\)"$/\1/')
 
 		for isw_subset in $Isw_Subsets

-- 
Maintenance of the dmraid package