Merge lp:~psusi/ubuntu/precise/dmraid/fix-gpt into lp:ubuntu/precise/dmraid

[Phillip Susi]

Changed dmraid-activate script and udev rule to let kpartx handle activating the partitions, because it understands gpt.

[lp:~psusi/ubuntu/precise/dmraid/fix-gpt]

61. By Phillip Susi on 2012-01-10

* Switch to using kpartx to activate partitions. This
  allows dmraid to work on gpt formatted disks. Change
  priority of udev rule so it runs after kpartx.
* Add 25_change-uuid.patch: Change the UUID set on partitions
  and internal subset devices ( each half of a raid10 ) to
  differentiate them from the main disk so that parted will
  not show the internal subset devices and kpartx will not
  probe them for partitions.

[Colin Watson (cjwatson)]

We don't have a kpartx-udeb. I'll change this to multipath-udeb.

Otherwise this looks good to me. Thanks.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-06 01:37:22 +0000
+++ debian/changelog	2012-01-10 23:17:25 +0000
@@ -1,3 +1,16 @@
+dmraid (1.0.0.rc16-4.1ubuntu5) precise; urgency=low
+
+  * Switch to using kpartx to activate partitions.  This
+    allows dmraid to work on gpt formatted disks.  Change
+    priority of udev rule so it runs after kpartx.
+  * Add 25_change-uuid.patch: Change the UUID set on partitions
+    and internal subset devices ( each half of a raid10 ) to
+    differentiate them from the main disk so that parted will
+    not show the internal subset devices and kpartx will not
+    probe them for partitions.
+
+ -- Phillip Susi <[e-mail]>  Sun, 08 Jan 2012 16:28:52 -0500
+
 dmraid (1.0.0.rc16-4.1ubuntu4) oneiric; urgency=low
 
   * Drop 22_add_pdc_64bit_addressing.patch: breaks some
 
=== modified file 'debian/control'
--- debian/control	2011-03-24 00:37:47 +0000
+++ debian/control	2012-01-10 23:17:25 +0000
@@ -12,7 +12,7 @@
 
 Package: dmraid
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, udev, dmsetup
+Depends: ${shlibs:Depends}, ${misc:Depends}, udev, dmsetup, kpartx
 Description: Device-Mapper Software RAID support tool
  dmraid discovers, activates, deactivates and displays properties
  of software RAID sets (eg, ATARAID) and contained DOS partitions.
@@ -36,7 +36,7 @@
 Architecture: any
 Section: debian-installer
 XC-Package-Type: udeb
-Depends: ${shlibs:Depends}, dmsetup-udeb
+Depends: ${shlibs:Depends}, dmsetup-udeb, kpartx-udeb
 Description: Device-Mapper Software RAID support tool (udeb)
  dmraid discovers, activates, deactivates and displays properties
  of software RAID sets (eg, ATARAID) and contained DOS partitions.
 
=== modified file 'debian/dmraid-activate'
--- debian/dmraid-activate	2011-01-26 16:30:29 +0000
+++ debian/dmraid-activate	2012-01-10 23:17:25 +0000
@@ -68,7 +68,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.
 
-	dmraid -i -ay -Z "$1"
+	dmraid -p -i -ay -Z "$1"
 	return $Return_Val
 }
 
 
=== modified file 'debian/dmraid.udev'
--- debian/dmraid.udev	2010-04-07 15:05:37 +0000
+++ debian/dmraid.udev	2012-01-10 23:17:25 +0000
@@ -4,3 +4,5 @@
 
 SUBSYSTEM=="block", ACTION=="add", ENV{ID_TYPE}=="disk", ENV{ID_FS_USAGE}=="raid", KERNEL=="hd[a-z]|sd[a-z]", \
 	RUN+="/sbin/dmraid-activate %k"
+ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="DMRAID-*", \
+        RUN+="/sbin/kpartx -a /dev/$kernel"
 \ No newline at end of file
 
=== added file 'debian/patches/25_change-uuid.patch'
--- debian/patches/25_change-uuid.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/25_change-uuid.patch	2012-01-10 23:17:25 +0000
@@ -0,0 +1,77 @@
+From: Phillip Susi <[e-mail]>
+Subject: Change uuid for partitions and internal devices
+Description: Change the uuid for internal devices ( like
+ each half of a raid10 ) so that the rest of the system
+ can recognize that the internal device should not be
+ probed for partitions or filesystems or mounted.  Also
+ change partition's uuid to have the same "partNN-"
+ prefix that kpartx gives them.
+
+Index: b/1.0.0.rc16/lib/activate/devmapper.c
+===================================================================
+--- a/1.0.0.rc16/lib/activate/devmapper.c
++++ b/1.0.0.rc16/lib/activate/devmapper.c
+@@ -171,8 +171,18 @@ dmraid_uuid(struct lib_context *lc, stru
+ 	/* Clear garbage data from uuid string */
+ 	memset(uuid, 0, uuid_len);
+ 
+-	/* Create UUID string from subsystem prefix and RAID set name. */
+-	r = snprintf(uuid, uuid_len, "DMRAID-%s", name) < uuid_len;
++	/* Create UUID string from subsystem prefix and RAID set name.  *
++	 * Prefix partitions with "partNN-" and add an 'I' for internal *
++	 * for stacked devices ( each half of a raid10 )                */
++
++	if (rs->type & t_partition) {
++		char *part;
++		for (part = name + strlen(name) - 1; isdigit(*part); part--);
++		part++;
++		r = snprintf(uuid, uuid_len, "part%s-DMRAID-%S", part, name) < uuid_len;
++	} else if (rs->flags & f_subset)
++		r = snprintf(uuid, uuid_len, "DMRAIDI-%s", name) < uuid_len;
++	else r = snprintf(uuid, uuid_len, "DMRAID-%s", name) < uuid_len;
+ 	return r < 0 ? 0 : (r < uuid_len);
+ }
+ 
+Index: b/1.0.0.rc16/include/dmraid/metadata.h
+===================================================================
+--- a/1.0.0.rc16/include/dmraid/metadata.h
++++ b/1.0.0.rc16/include/dmraid/metadata.h
+@@ -177,6 +177,7 @@ enum flags {
+ 	f_maximize = 0x01,	/* If set, maximize set capacity,
+ 				   if not set, limit to smallest device. */
+ 	f_partitions = 0x02,	/* Set has partitions. */
++	f_subset = 0x04,	/* Set is an internal subset ( half of raid10 ) */
+ };
+ 
+ #define	F_MAXIMIZE(rs)		((rs)->flags & f_maximize)
+Index: b/1.0.0.rc16/lib/format/ataraid/isw.c
+===================================================================
+--- a/1.0.0.rc16/lib/format/ataraid/isw.c
++++ b/1.0.0.rc16/lib/format/ataraid/isw.c
+@@ -877,7 +877,8 @@ group_rd(struct lib_context *lc,
+ 				free_raid_dev(lc, &rd);
+ 				return NULL;
+ 			}
+-
++			if (is_raid10(dev))
++				rs->flags |= f_subset;
+ 			rs->status = s_ok;
+ 
+ 			/* Save and set to enable dev_sort(). */
+Index: b/1.0.0.rc16/lib/format/format.c
+===================================================================
+--- a/1.0.0.rc16/lib/format/format.c
++++ b/1.0.0.rc16/lib/format/format.c
+@@ -649,9 +649,10 @@ join_superset(struct lib_context *lc,
+ 	if ((n = f_name(lc, rd, 0))) {
+ 		if ((ret = find_or_alloc_raid_set(lc, n, FIND_TOP, NO_RD,
+ 						  LC_RS(lc), f_create, rd)) &&
+-		    !find_set(lc, &ret->sets, rs->name, FIND_TOP))
++		    !find_set(lc, &ret->sets, rs->name, FIND_TOP)) {
+ 			list_add_sorted(lc, &ret->sets, &rs->list, f_set_sort);
+-
++			rs->flags |= f_subset;
++		}
+ 		dbg_free(n);
+ 	}
+ 
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-05-06 01:37:22 +0000
+++ debian/patches/series	2012-01-10 23:17:25 +0000
@@ -14,3 +14,4 @@
 #22_add_pdc_64bit_addressing.patch
 23_pdc_dump_extended_metadata.patch
 24_drop_p_for_partition_conditional.patch
+25_change-uuid.patch
 
=== modified file 'debian/rules'
--- debian/rules	2010-02-04 21:34:22 +0000
+++ debian/rules	2012-01-10 23:17:25 +0000
@@ -69,7 +69,7 @@
 	dh_testroot
 	dh_install
 	dh_installdirs
-	dh_installudev --priority=85
+	dh_installudev --priority=97
 	dh_installdocs ${version}/CREDITS ${version}/KNOWN_BUGS ${version}/README ${version}/TODO
 	dh_installchangelogs ${version}/CHANGELOG
 	install -m0755 debian/dmraid.bug debian/dmraid/usr/share/bug/dmraid/script