Hello community, here is the log from the commit of package udev checked in at Thu Nov 16 01:06:42 CET 2006. -------- --- udev/udev.changes 2006-11-14 20:25:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/udev/udev.changes 2006-11-15 19:56:54.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 15 19:54:32 CET 2006 - kay.sievers@suse.de + +- fix endianess bug in libvolume_id for md raid (#221351) +- don't catch raw1394 as raw blockdev (#219555) + +------------------------------------------------------------------- New: ---- vol_id-md-raid.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ udev.spec ++++++ --- /var/tmp/diff_new_pack.M5vo16/_old 2006-11-16 01:06:16.000000000 +0100 +++ /var/tmp/diff_new_pack.M5vo16/_new 2006-11-16 01:06:16.000000000 +0100 @@ -13,7 +13,7 @@ Name: udev URL: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ Version: 103 -Release: 8 +Release: 9 License: GNU General Public License (GPL) Group: System/Kernel Summary: A Rule-Based Device Node and Kernel Event Manager @@ -42,6 +42,7 @@ # doc Source70: show_event_log Source71: README.debug +Patch1: vol_id-md-raid.patch %description udev's main task is to create and remove device nodes in /dev when a @@ -92,6 +93,7 @@ %define extras "extras/scsi_id extras/volume_id extras/ata_id extras/usb_id extras/edd_id extras/dasd_id extras/cdrom_id extras/floppy extras/path_id extras/firmware" %prep %setup +%patch1 -p1 %build make V=1 libdir=/%{_lib} usrlibdir=%{_libdir} OPTFLAGS="${RPM_OPT_FLAGS}" EXTRAS=%{extras} all @@ -260,6 +262,9 @@ /%{_lib}/libvolume_id.so.* %changelog -n udev +* Wed Nov 15 2006 - kay.sievers@suse.de +- fix endianess bug in libvolume_id for md raid (#221351) +- don't catch raw1394 as raw blockdev (#219555) * Tue Nov 14 2006 - kay.sievers@suse.de - add empty "Required-Start:" to boot.udev (LSB you rock!) (#200174) - put "noz*" devices in "uucp" group (#217739) ++++++ 50-udev-default.rules ++++++ --- udev/50-udev-default.rules 2006-11-14 20:15:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/udev/50-udev-default.rules 2006-11-15 19:30:35.000000000 +0100 @@ -122,7 +122,8 @@ KERNEL=="pt*|npt*", GROUP="disk" KERNEL=="pg*", GROUP="disk" KERNEL=="evms/block_device*", GROUP="disk" -KERNEL=="rawctl*|raw[0-9]*", NAME="raw/%k", GROUP="disk" +KERNEL=="rawctl*", NAME="raw/%k", GROUP="disk" +SUBSYSTEM=="block", KERNEL=="raw[0-9]*", NAME="raw/%k", GROUP="disk" KERNEL=="osst*|nosst*", NAME="%k", GROUP="disk" KERNEL=="iseries/vt*", NAME="%k", GROUP="disk" KERNEL=="iseries/nvt*", NAME="%k", GROUP="disk" ++++++ vol_id-md-raid.patch ++++++ diff --git a/extras/volume_id/lib/linux_raid.c b/extras/volume_id/lib/linux_raid.c index 1781937..b8a819f 100644 --- a/extras/volume_id/lib/linux_raid.c +++ b/extras/volume_id/lib/linux_raid.c @@ -27,7 +27,7 @@ #include "util.h" static struct mdp_super_block { - uint32_t md_magic; + uint8_t md_magic[4]; uint32_t major_version; uint32_t minor_version; uint32_t patch_version; @@ -46,7 +46,7 @@ static struct mdp_super_block { } PACKED *mdp; #define MD_RESERVED_BYTES 0x10000 -#define MD_MAGIC 0xa92b4efc +#define MD_MAGIC "\xa9\x2b\x4e\xfc" int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size) { @@ -56,7 +56,6 @@ int volume_id_probe_linux_raid(struct vo info("probing at offset 0x%llx, size 0x%llx", (unsigned long long) off, (unsigned long long) size); - if (size < 0x10000) return -1; @@ -64,24 +63,20 @@ int volume_id_probe_linux_raid(struct vo buf = volume_id_get_buffer(id, off + sboff, 0x800); if (buf == NULL) return -1; - mdp = (struct mdp_super_block *) buf; - if (le32_to_cpu(mdp->md_magic) != MD_MAGIC) + if (memcmp(mdp->md_magic, MD_MAGIC, 4) != 0) return -1; memcpy(uuid, &mdp->set_uuid0, 4); memcpy(&uuid[4], &mdp->set_uuid1, 12); volume_id_set_uuid(id, uuid, UUID_DCE); - snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%u.%u", le32_to_cpu(mdp->major_version), le32_to_cpu(mdp->minor_version), le32_to_cpu(mdp->patch_version)); - dbg("found raid signature"); volume_id_set_usage(id, VOLUME_ID_RAID); id->type = "linux_raid_member"; - return 0; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org