diff options
| author | James Meyer <james.meyer@operamail.com> | 2009-07-04 23:05:09 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2009-07-04 23:05:09 (GMT) |
| commit | 879da47e831fa0c5dc443f1059717af8184cb6d8 (patch) | |
| tree | 08892860acda11a7594788c8687ec960dac4b68d /abs/core-testing/mdadm/mdadm-2.2-segfault.patch | |
| parent | 19e8f207678d02f9a912aa0728b90a4c63d82c82 (diff) | |
| parent | 21f912004613ab41436b36b424f943f3c5bfbf83 (diff) | |
| download | linhes_pkgbuild-879da47e831fa0c5dc443f1059717af8184cb6d8.zip linhes_pkgbuild-879da47e831fa0c5dc443f1059717af8184cb6d8.tar.gz linhes_pkgbuild-879da47e831fa0c5dc443f1059717af8184cb6d8.tar.bz2 | |
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Conflicts:
abs/core-testing/LinHES-config/PKGBUILD
Diffstat (limited to 'abs/core-testing/mdadm/mdadm-2.2-segfault.patch')
| -rw-r--r-- | abs/core-testing/mdadm/mdadm-2.2-segfault.patch | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/abs/core-testing/mdadm/mdadm-2.2-segfault.patch b/abs/core-testing/mdadm/mdadm-2.2-segfault.patch deleted file mode 100644 index d956a20..0000000 --- a/abs/core-testing/mdadm/mdadm-2.2-segfault.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur mdadm-2.2-orig/Assemble.c mdadm-2.2/Assemble.c ---- mdadm-2.2-orig/Assemble.c 2005-12-04 21:56:20.000000000 -0800 -+++ mdadm-2.2/Assemble.c 2006-02-06 10:56:37.000000000 -0800 -@@ -219,7 +219,7 @@ - } - if (dfd >= 0) close(dfd); - -- if (ident->uuid_set && (!update && strcmp(update, "uuid")!= 0) && -+ if (ident->uuid_set && (!update || strcmp(update, "uuid")!= 0) && - (!super || same_uuid(info.uuid, ident->uuid, tst->ss->swapuuid)==0)) { - if ((inargv && verbose >= 0) || verbose > 0) - fprintf(stderr, Name ": %s has wrong uuid.\n", |