Hello community, here is the log from the commit of package multipath-tools checked in at Tue Jun 6 13:04:10 CEST 2006. -------- --- multipath-tools/multipath-tools.changes 2006-05-22 17:16:06.000000000 +0200 +++ multipath-tools/multipath-tools.changes 2006-06-06 13:02:11.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Jun 2 12:47:05 CEST 2006 - hare@suse.de + +- Merge in fixed from upstream + - Set device-mapper name correctly (#181127) + +------------------------------------------------------------------- +Thu Jun 1 17:29:23 CEST 2006 - hare@suse.de + +- Merge in fixes from upstream + - Fixup aliasing handling + - Fix string length in pp_alua +- Use correct regexp patterns for hwtable (#177842) +- Fixup 71-multipath.rules to work correctly with the + updated device-mapper online/offline events (#176516 - LTC23961) +- Add kpartx_id for the updated 71-multipath.rules + +------------------------------------------------------------------- Old: ---- kpartx_del New: ---- kpartx_id multipath-tools-fixup-hwtable-regexp ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ multipath-tools.spec ++++++ --- /var/tmp/diff_new_pack.faw9Gd/_old 2006-06-06 13:04:00.000000000 +0200 +++ /var/tmp/diff_new_pack.faw9Gd/_new 2006-06-06 13:04:00.000000000 +0200 @@ -20,14 +20,14 @@ %endif Autoreqprov: on Version: 0.4.6 -Release: 25 +Release: 26 Summary: Tools to Manage Multipathed Devices with the device-mapper Source: multipath-tools-%{version}.tar.bz2 Source1: multipathd Source3: 71-multipath.rules Source4: boot.multipath Source5: mpath_id -Source6: kpartx_del +Source6: kpartx_id BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch0: %{name}-git-update.patch Patch4: %{name}-ibm-3526-update @@ -36,7 +36,8 @@ Patch11: %{name}-no-gz-for-manpage Patch12: %{name}-split-off-DS6000 Patch13: %{name}-remove-obsolete-option-from-manpage -Patch14: %{name}-strip.patch +Patch14: %{name}-fixup-hwtable-regexp +Patch15: %{name}-strip.patch %description This package provides the tools to manage multipathed devices by @@ -67,7 +68,8 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 -%patch14 +%patch14 -p1 +%patch15 %build make OPTFLAGS="$RPM_OPT_FLAGS" BUILD=glibc @@ -105,7 +107,7 @@ /sbin/multipath /sbin/kpartx /sbin/mpath_id -/sbin/kpartx_del +/sbin/kpartx_id /sbin/multipathd /sbin/mpath_prio_netapp /sbin/mpath_prio_balance_units @@ -122,6 +124,17 @@ %{_mandir}/man8/mpath_prio_alua.8* %changelog -n multipath-tools +* Fri Jun 02 2006 - hare@suse.de +- Merge in fixed from upstream +- Set device-mapper name correctly (#181127) +* Thu Jun 01 2006 - hare@suse.de +- Merge in fixes from upstream +- Fixup aliasing handling +- Fix string length in pp_alua +- Use correct regexp patterns for hwtable (#177842) +- Fixup 71-multipath.rules to work correctly with the + updated device-mapper online/offline events (#176516 - LTC23961) +- Add kpartx_id for the updated 71-multipath.rules * Mon May 22 2006 - schwab@suse.de - Don't strip binaries. * Tue May 02 2006 - hare@suse.de ++++++ 71-multipath.rules ++++++ --- multipath-tools/71-multipath.rules 2006-03-09 11:24:25.000000000 +0100 +++ multipath-tools/71-multipath.rules 2006-06-02 15:27:38.000000000 +0200 @@ -2,14 +2,34 @@ # multipath and multipath partitions nodes are created in /dev/mapper/ # -ACTION=="add", SUBSYSTEM=="block", KERNEL=="dm-*", \ - IMPORT{program}="/sbin/mpath_id %M %m" +KERNEL!="dm-*", GOTO="multipath_end" +ACTION=="offline|remove", GOTO="multipath_end" -# take care of devmap partitioning -ACTION=="add", SUBSYSTEM=="block", KERNEL=="dm-*", ENV{ID_MPATH}=="?*", \ +PROGRAM="/sbin/dmsetup table -j %M -m %m", \ + RESULT=="*multipath*", ENV{ID_DMTYPE}="multipath" +RESULT=="", GOTO="multipath_end" + +RESULT=="*linear*", PROGRAM="/sbin/kpartx_id %M %m", RESULT=="*", ENV{ID_DMTYPE}="linear" + +ENV{ID_DMTYPE}=="multipath|linear", PROGRAM="/sbin/dmsetup info -c --noopencount --noheadings -o name -j %M -m %m", ENV{ID_MPATH}="%c" + +# Create persistent links for the multipath table +ENV{ID_DMTYPE}=="multipath", ENV{ID_MPATH}=="?*", \ + SYMLINK+="disk/by-id/scsi-$env{ID_MPATH}" + +# Create dm tables for partitions on multipath devices +ENV{ID_DMTYPE}=="multipath", ENV{ID_MPATH}=="?*", \ RUN+="/sbin/kpartx -a -p -part /dev/mapper/$env{ID_MPATH}" -# This deletes old partitions; still experimental -# ACTION=="delete", SUBSYSTEM=="block", KERNEL=="dm-*", \ +# Create persistent links for the partition +ENV{ID_DMTYPE}=="linear", ENV{ID_MPATH}=="?*", \ + SYMLINK+="disk/by-id/scsi-$env{ID_MPATH}" + +# Delete partition tables +# This doesn't work; we're never seeing any remove events as the +# tables for partitions keep this one busy +# ACTION=="offline", \ # RUN+="/sbin/kpartx_delete %M %m" +LABEL="multipath_end" + ++++++ multipath-tools-git-update.patch ++++++ ++++ 1493 lines (skipped) ++++ between multipath-tools/multipath-tools-git-update.patch ++++ and multipath-tools/multipath-tools-git-update.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org