![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package dmraid checked in at Wed Sep 24 15:15:41 CEST 2008. -------- --- dmraid/dmraid.changes 2008-09-15 13:45:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/dmraid/dmraid.changes 2008-09-16 17:53:54.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 16 17:36:09 CEST 2008 - mkoenig@suse.de + +- ignore the timestamp for LSI 1068E DDF1 metadata [bnc#426615] + +------------------------------------------------------------------- New: ---- dmraid-1.0.0.rc14-fixup_lsi1068e.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dmraid.spec ++++++ --- /var/tmp/diff_new_pack.q25181/_old 2008-09-24 15:15:21.000000000 +0200 +++ /var/tmp/diff_new_pack.q25181/_new 2008-09-24 15:15:21.000000000 +0200 @@ -27,7 +27,7 @@ AutoReqProv: on Summary: A Device-Mapper Software RAID Support Tool Version: 1.0.0.rc14 -Release: 94 +Release: 95 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/dmraid-%{version}.tar.bz2 Source1: sysconfig.dmraid Source2: boot.dmraid @@ -46,7 +46,9 @@ Patch7: dmraid-pdc_max_sectors.patch Patch8: dmraid-1.0.0.rc14-ddf1_segfault.patch Patch9: dmraid-move-type-definition.diff -Patch10: libdmraid-events.dif +Patch10: dmraid-1.0.0.rc14-fixup_lsi1068e.patch +# libdmraid-events +Patch50: libdmraid-events.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq @@ -119,8 +121,9 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 pushd libdmraid* -%patch10 +%patch50 popd cp %{SOURCE3} . @@ -202,6 +205,8 @@ /%{_lib}/libdmraid-events.so.0 %changelog +* Tue Sep 16 2008 mkoenig@suse.de +- ignore the timestamp for LSI 1068E DDF1 metadata [bnc#426615] * Mon Sep 15 2008 ro@suse.de - fix typo in libdmraid Makefile - split off libdmraid-events0 package according to ++++++ dmraid-1.0.0.rc14-fixup_lsi1068e.patch ++++++ Index: 1.0.0.rc14/lib/format/ddf/ddf1.c =================================================================== --- 1.0.0.rc14.orig/lib/format/ddf/ddf1.c +++ 1.0.0.rc14/lib/format/ddf/ddf1.c @@ -28,6 +28,9 @@ static const char *handler = HANDLER; // #define PCI_VENDOR_ID_ADAPTEC 0x9004 #define PCI_VENDOR_ID_ADAPTEC2 0x9005 +/* PCI IDs for LSI */ +#define PCI_VENDOR_ID_LSI 0x1000 + /* Map DDF1 disk status to dmraid status */ static enum status disk_status(struct ddf1_phys_drive *disk) { struct states states[] = { @@ -358,6 +361,13 @@ static int read_extended(struct lib_cont ddf1->adaptec_mode = 1; } + if (ddf1->adapter && + ddf1->adapter->pci_vendor == PCI_VENDOR_ID_LSI) { + log_notice(lc, "%s: LSI mode discovered on %s", + handler, di->path); + ddf1->lsi_mode = 1; + } + /* Read physical drive characteristic data */ where = to_bytes(pri->primary_table_lba + pri->disk_data_offset); if (!(ddata = ddf1->disk_data = @@ -667,10 +677,14 @@ static char *name(struct lib_context *lc } else { char *b; - for (b = buf + prefix, i = 0; i < 24; b += 8, i += 4) - sprintf(b, "%02x%02x%02x%02x", - vd->guid[i], vd->guid[i+1], - vd->guid[i+2], vd->guid[i+3]); + for (b = buf + prefix, i = 0; i < 24; b += 8, i += 4) { + if (i == 16 && ddf1->lsi_mode) + sprintf(b, "00000000"); + else + sprintf(b, "%02x%02x%02x%02x", + vd->guid[i], vd->guid[i+1], + vd->guid[i+2], vd->guid[i+3]); + } } out: Index: 1.0.0.rc14/lib/format/ddf/ddf1.h =================================================================== --- 1.0.0.rc14.orig/lib/format/ddf/ddf1.h +++ 1.0.0.rc14/lib/format/ddf/ddf1.h @@ -264,6 +264,7 @@ struct ddf1 { int disk_format; int in_cpu_format; int adaptec_mode; + int lsi_mode; }; #endif /* FORMAT_HANDLER */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de