r50 - in mdadm/trunk/debian: . patches

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-08-01 13:17:51 +0000 (Tue, 01 Aug 2006)
New Revision: 50

Added:
   mdadm/trunk/debian/patches/99-run-logic-FIX.dpatch
Modified:
   mdadm/trunk/debian/changelog
   mdadm/trunk/debian/mdadm-raid
Log:
* Applied patch by upstream to fix the logic of the --run switch (see
  #287415). Thus also reverted the mdadm-raid hack used to fix the bug in
  the 2.5.2-9 upload.

Modified: mdadm/trunk/debian/changelog
===================================================================
--- mdadm/trunk/debian/changelog	2006-08-01 11:11:58 UTC (rev 49)
+++ mdadm/trunk/debian/changelog	2006-08-01 13:17:51 UTC (rev 50)
@@ -1,8 +1,11 @@
 mdadm (2.5.2-10) UNRELEASED; urgency=low
 
   * Added README.checkarray with some information about the check process.
+  * Applied patch by upstream to fix the logic of the --run switch (see
+    #287415). Thus also reverted the mdadm-raid hack used to fix the bug in
+    the 2.5.2-9 upload.
 
- -- martin f. krafft <madduck at debian.org>  Tue,  1 Aug 2006 12:11:18 +0100
+ -- martin f. krafft <madduck at debian.org>  Tue,  1 Aug 2006 14:16:55 +0100
 
 mdadm (2.5.2-9) unstable; urgency=low
 

Modified: mdadm/trunk/debian/mdadm-raid
===================================================================
--- mdadm/trunk/debian/mdadm-raid	2006-08-01 11:11:58 UTC (rev 49)
+++ mdadm/trunk/debian/mdadm-raid	2006-08-01 13:17:51 UTC (rev 50)
@@ -80,7 +80,7 @@
         IFSOLD=${IFS:-}
         IFS='
 '
-        for line in $($MDADM --assemble --scan --run --auto=yes 2>&1); do
+        for line in $($MDADM --assemble --scan --auto=yes 2>&1); do
           IFS=$IFSOLD
           set -- $line
           shift

Added: mdadm/trunk/debian/patches/99-run-logic-FIX.dpatch
===================================================================
--- mdadm/trunk/debian/patches/99-run-logic-FIX.dpatch	2006-08-01 11:11:58 UTC (rev 49)
+++ mdadm/trunk/debian/patches/99-run-logic-FIX.dpatch	2006-08-01 13:17:51 UTC (rev 50)
@@ -0,0 +1,53 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99-run-logic-FIX.dpatch by martin f. krafft <madduck at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mdadm-2.5.2.obsolete.0.0575067182808233~/mdadm.c mdadm-2.5.2.obsolete.0.0575067182808233/mdadm.c
+--- mdadm-2.5.2.obsolete.0.0575067182808233~/mdadm.c	2006-06-26 06:11:00.000000000 +0100
++++ mdadm-2.5.2.obsolete.0.0575067182808233/mdadm.c	2006-08-01 14:16:07.253413451 +0100
+@@ -1017,7 +1017,7 @@
+ 				else {
+ 					rv |= Assemble(ss, array_list->devname, mdfd,
+ 						       array_list,
+-						       devlist, NULL,
++						       NULL, NULL,
+ 						       readonly, runstop, NULL, homehost, verbose-quiet, force);
+ 					if (rv == 0) cnt++;
+ 				}
+@@ -1036,7 +1036,7 @@
+ 					do {
+ 						rv2 = Assemble(ss, NULL, -1,
+ 							       &ident,
+-							       devlist, NULL,
++							       NULL, NULL,
+ 							       readonly, runstop, NULL, homehost, verbose-quiet, force);
+ 						if (rv2==0) {
+ 							cnt++;
+@@ -1049,7 +1049,6 @@
+ 							auto_update_home = 0;
+ 					} while (rv2!=2);
+ 					/* Incase there are stacked devices, we need to go around again */
+-					devlist = conf_get_devs();
+ 				} while (acnt);
+ 				if (cnt == 0 && auto_update_home && homehost) {
+ 					/* Nothing found, maybe we need to bootstrap homehost info */
+@@ -1058,7 +1057,7 @@
+ 						do {
+ 							rv2 = Assemble(ss, NULL, -1,
+ 								       &ident,
+-								       devlist, NULL,
++								       NULL, NULL,
+ 								       readonly, runstop, "homehost", homehost, verbose-quiet, force);
+ 							if (rv2==0) {
+ 								cnt++;
+@@ -1066,7 +1065,6 @@
+ 							}
+ 						} while (rv2!=2);
+ 						/* Incase there are stacked devices, we need to go around again */
+-						devlist = conf_get_devs();
+ 					} while (acnt);
+ 				}
+ 				if (cnt == 0 && rv == 0) {


Property changes on: mdadm/trunk/debian/patches/99-run-logic-FIX.dpatch
___________________________________________________________________
Name: svn:executable
   + *