Hello community,
here is the log from the commit of package multipath-tools
checked in at Fri Sep 1 01:36:40 CEST 2006.
--------
--- multipath-tools/multipath-tools.changes 2006-08-17 02:08:26.000000000 +0200
+++ multipath-tools/multipath-tools.changes 2006-08-31 10:58:54.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Aug 31 10:56:01 CEST 2006 - hare@suse.de
+
+- include latest fixes from git tree
+- update kpartx_id and udev rules to work
+ with dmraid.
+- Fix return value for multipath -l
+
+-------------------------------------------------------------------
New:
----
multipath-tools-fixup-return-code
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ multipath-tools.spec ++++++
--- /var/tmp/diff_new_pack.Qsu2ew/_old 2006-09-01 01:34:26.000000000 +0200
+++ /var/tmp/diff_new_pack.Qsu2ew/_new 2006-09-01 01:34:26.000000000 +0200
@@ -20,7 +20,7 @@
%endif
Autoreqprov: on
Version: 0.4.7
-Release: 2
+Release: 4
Summary: Tools to Manage Multipathed Devices with the device-mapper
Source: multipath-tools-%{version}.tar.bz2
Source1: multipathd
@@ -33,6 +33,7 @@
Patch0: %{name}-git-update.patch
Patch4: %{name}-ibm-3526-update
Patch5: %{name}-pp_tpc-disable-debug-output.patch
+Patch6: %{name}-fixup-return-code
Patch10: %{name}-online-device.patch
Patch11: %{name}-no-gz-for-manpage
Patch12: %{name}-split-off-DS6000
@@ -63,10 +64,10 @@
%prep
%setup -n multipath-tools-%{version}
-cp multipath/main.h libmultipath/version.h
%patch0 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
@@ -127,6 +128,11 @@
%{_mandir}/man8/mpath_prio_alua.8*
%changelog -n multipath-tools
+* Thu Aug 31 2006 - hare@suse.de
+- include latest fixes from git tree
+- update kpartx_id and udev rules to work
+ with dmraid.
+- Fix return value for multipath -l
* Thu Aug 17 2006 - ro@suse.de
- workaround problem in git-patch
normal patch can't do a "rename", so copy file first
++++++ 71-multipath.rules ++++++
--- multipath-tools/71-multipath.rules 2006-06-02 15:27:38.000000000 +0200
+++ multipath-tools/71-multipath.rules 2006-08-31 12:26:36.000000000 +0200
@@ -1,35 +1,25 @@
#
-# multipath and multipath partitions nodes are created in /dev/mapper/
+# persistent links for device-mapper devices
+# only hardware-backed device-mapper devices (ie multipath, dmraid,
+# and kpartx) have meaningful persistent device names
#
KERNEL!="dm-*", GOTO="multipath_end"
ACTION=="offline|remove", GOTO="multipath_end"
-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}"
-
-# 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"
+ACTION=="online", IMPORT{program}=="/sbin/kpartx_id %M %m"
+# Create persistent links for tables
+ACTION=="online", ENV{ID_DM_TABLE}=="mpath|dmraid", ENV{ID_DM_TYPE}=="?*", \
+ SYMLINK+="disk/by-id/$env{ID_DM_TYPE}-$env{ID_DM_NAME}"
+
+# Create dm tables for partitions
+ACTION=="online", ENV{ID_DM_TABLE}=="mpath|dmraid", \
+ RUN+="/sbin/kpartx -a /dev/mapper/$env{ID_DM_NAME}"
+
+# Create persistent links for partitions
+ACTION=="online", ENV{ID_DM_TABLE}=="part", ENV{ID_DM_TYPE}=="?*", \
+ SYMLINK+="disk/by-id/$env{ID_DM_TYPE}-$env{ID_DM_NAME}-part$env{ID_DM_PART}
+"
LABEL="multipath_end"
++++++ boot.multipath ++++++
--- multipath-tools/boot.multipath 2006-05-02 14:38:34.000000000 +0200
+++ multipath-tools/boot.multipath 2006-07-17 11:53:46.000000000 +0200
@@ -53,10 +53,19 @@
case "$1" in
start)
echo -n "Creating multipath targets"
+ # Check whether multipath daemon is already running
+ if /sbin/multipathd -k"list paths" > /dev/null 2>&1 ; then
+ echo -n " (multipathd running)"
+ rc_status -v
+ rc_exit
+ fi
# Load prerequisite module
modprobe dm-multipath
+ # Be a chicken and flush all existing maps
+ $PROGRAM -F
+
# Clear /dev/disk/by-name/ prior to start-up; multipath will
# recreate them.
rm -f /dev/disk/by-name/* 2>&1 >/dev/null
++++++ kpartx_id ++++++
--- multipath-tools/kpartx_id 2006-06-02 15:38:39.000000000 +0200
+++ multipath-tools/kpartx_id 2006-08-31 09:30:59.000000000 +0200
@@ -2,13 +2,23 @@
#
# kpartx_id
#
-# Checks whether a given dm table is a table for a partition
-# on a multipathed device as created by kpartx.
+# Generates ID information for device-mapper tables.
#
-# A table has been created by kpartx if
-# 1) it is of type 'linear'
-# 2) has exactly one dependency
-# 3) this dependency is of type 'multipath'
+# Copyright (C) 2006 SUSE Linux Products GmbH
+# Author:
+# Hannes Reinecke