[Dmraid-debian-commits] [SCM] Maintenance of the dmraid package branch, lenny, updated. f3a39013818e22a898b744fc42e4a138d328de3a

[Giuseppe Iuculano]

The following commit has been merged in the lenny branch:
commit fcc082db527abc8609546c4e8e4f019cd58472b7
Author: Giuseppe Iuculano <giuseppe at iuculano.it>
Date:   Fri Jan 23 18:13:04 2009 +0100

    debian/patches/04_generate-uuids.dpatch: Do not call dm_task_run() only for DM_DEVICE_CREATE, but also for DM_DEVICE_REMOVE. (LP: #306275)

diff --git a/debian/patches/04_generate-uuids.dpatch b/debian/patches/04_generate-uuids.dpatch
old mode 100644
new mode 100755
index 9dab251..66f5b92
--- a/debian/patches/04_generate-uuids.dpatch
+++ b/debian/patches/04_generate-uuids.dpatch
@@ -5,9 +5,9 @@
 ## DP: Generate UUIDs with DMRAID prefix.
 
 @DPATCH@
-diff -urNad dmraid-1.0.0.rc14-1ubuntu1~/1.0.0.rc14/lib/activate/devmapper.c dmraid-1.0.0.rc14-1ubuntu1/1.0.0.rc14/lib/activate/devmapper.c
---- dmraid-1.0.0.rc14-1ubuntu1~/1.0.0.rc14/lib/activate/devmapper.c	2006-09-15 23:52:11.000000000 +1000
-+++ dmraid-1.0.0.rc14-1ubuntu1/1.0.0.rc14/lib/activate/devmapper.c	2008-07-08 14:10:06.000000000 +1000
+diff -urNad dmraid.git~/1.0.0.rc14/lib/activate/devmapper.c dmraid.git/1.0.0.rc14/lib/activate/devmapper.c
+--- dmraid.git~/1.0.0.rc14/lib/activate/devmapper.c	2009-01-23 16:48:44.000000000 +0100
++++ dmraid.git/1.0.0.rc14/lib/activate/devmapper.c	2009-01-23 18:08:44.000000000 +0100
 @@ -21,6 +21,8 @@
  #include "internal.h"
  #include "devmapper.h"
@@ -17,7 +17,7 @@ diff -urNad dmraid-1.0.0.rc14-1ubuntu1~/1.0.0.rc14/lib/activate/devmapper.c dmra
  /* Make up a dm path. */
  char *mkdm_path(struct lib_context *lc, const char *name)
  {
-@@ -147,24 +149,48 @@
+@@ -147,24 +149,49 @@
  	return handle_table(lc, NULL, table, get_target_list());
  }
  
@@ -56,11 +56,12 @@ diff -urNad dmraid-1.0.0.rc14-1ubuntu1~/1.0.0.rc14/lib/activate/devmapper.c dmra
  
 -	if (ret)
 -		ret = dm_task_run(dmt);
-+	if (ret && 
-+	    DM_DEVICE_CREATE == type)
-+		ret = dmraid_uuid(lc, rs, uuid, DM_UUID_LEN) &&
-+		      dm_task_set_uuid(dmt, uuid) &&
-+		      dm_task_run(dmt);
++	if (ret) { 
++	    if (DM_DEVICE_CREATE == type &&
++		dmraid_uuid(lc, rs, uuid, DM_UUID_LEN))
++		    	dm_task_set_uuid(dmt, uuid);
++	    ret = dm_task_run(dmt);
++	}
  
  	_exit_dm(dmt);
  	return ret;

-- 
Maintenance of the dmraid package