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

Luke Yelavich luke.yelavich at canonical.com
Fri Feb 13 01:12:22 UTC 2009


The following commit has been merged in the master branch:
commit 072319d1591631e35ef7b277f4bcc6835d3410b6
Author: Luke Yelavich <luke.yelavich at canonical.com>
Date:   Fri Feb 13 11:57:07 2009 +1100

    debian/patches/05_kernel-event-handling.patch: Drop, as this was breaking RAID0
    activation for all metadata types, and the kernel event handling setup is
    present in rc15 anyway (Closes: #514798), (LP: #310928)

diff --git a/debian/changelog b/debian/changelog
index df7a3b6..4f09332 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,11 @@ dmraid (1.0.0.rc15-1~exp7) UNRELEASED; urgency=low
     before copying each udev rule
   * debian/dmraid-activate: Refactor code to allow for special casing of
     raid groups and subsets
+  * debian/patches/05_kernel-event-handling.patch: Drop, as this was breaking
+    RAID0 activation for all metadata types, and the kernel event handling
+    setup is present in rc15 anyway (Closes: #514798), (LP: #310928)
 
- -- Luke Yelavich <themuso at ubuntu.com>  Fri, 13 Feb 2009 11:46:38 +1100
+ -- Luke Yelavich <themuso at ubuntu.com>  Fri, 13 Feb 2009 11:52:31 +1100
 
 dmraid (1.0.0.rc15-1~exp6) experimental; urgency=low
 
diff --git a/debian/patches/05_kernel-event-handling.patch b/debian/patches/05_kernel-event-handling.patch
deleted file mode 100644
index a04e7af..0000000
--- a/debian/patches/05_kernel-event-handling.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Luke Yelavich <themuso at ubuntu.com>
-Description: Add support for kernel driver event handling support.
---- a/1.0.0.rc15/lib/activate/activate.c
-+++ b/1.0.0.rc15/lib/activate/activate.c
-@@ -239,7 +239,11 @@ _dm_raid0_eol(struct lib_context *lc,
- 		(*stripes)++;
- 	}
- 
--	return 1;
-+	/* Append the flag/feature required for dmraid1
-+	 * event handling in the kernel driver
-+	 */
-+	if(p_fmt(lc, table, " 1 handle_errors"))
-+		return 1;
- 
-       err:
- 	return 0;
diff --git a/debian/patches/series b/debian/patches/series
index 58d3fb0..5edc5f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
 02_scsi_serial_remove_ws.patch
 03_fix_hyphen-used-as-minus-sign.patch
 04_do_not_use_p_for_partition.patch
-05_kernel-event-handling.patch
 06_fix_led_support_compilation.patch
 07_isw_metadata_normal_state.patch
 08_isw_rebuild.patch

-- 
Maintenance of the dmraid package



More information about the Dmraid-debian-commits mailing list