summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authormadduck <madduck@3cfab66f-1918-0410-86b3-c06b76f9a464>2007-05-22 09:30:58 +0000
committermartin f. krafft <madduck@madduck.net>2007-10-07 21:19:09 +0100
commit34f27a2c3844fe6c0f6dcbf9da4e8d81ac36aa4a (patch)
treeba177085c91e6a25eb2cb6b920215e5894680d01 /debian/patches
parent6926d3163751cbb457492eb5dea785439c858c52 (diff)
replace 99-init-avail-FIX patch with upstream patch
Diffstat (limited to 'debian/patches')
-rwxr-xr-xdebian/patches/99-init-avail-FIX.dpatch23
1 files changed, 14 insertions, 9 deletions
diff --git a/debian/patches/99-init-avail-FIX.dpatch b/debian/patches/99-init-avail-FIX.dpatch
index 1c07a4ae..742f868f 100755
--- a/debian/patches/99-init-avail-FIX.dpatch
+++ b/debian/patches/99-init-avail-FIX.dpatch
@@ -8,12 +8,17 @@
diff -urNad mdadm-2.6.2~/Detail.c mdadm-2.6.2/Detail.c
--- mdadm-2.6.2~/Detail.c 2007-05-21 06:25:50.000000000 +0200
+++ mdadm-2.6.2/Detail.c 2007-05-21 14:41:40.000000000 +0200
-@@ -59,7 +59,7 @@
- void *super = NULL;
- int rv = test ? 4 : 1;
- int avail_disks = 0;
-- char *avail;
-+ char *avail = NULL;
-
- if (fd < 0) {
- fprintf(stderr, Name ": cannot open %s: %s\n",
+@@ -377,12 +377,12 @@ This is pretty boring
+
+ if (brief > 1 && devices) printf("\n devices=%s", devices);
+ if (brief) printf("\n");
+-out:
+ if (test &&
+ !enough(array.level, array.raid_disks, array.layout,
+ 1, avail, avail_disks))
+ rv = 2;
+
++out:
+ close(fd);
+ return rv;
+ }