forked from pool/multipath-tools
This commit is contained in:
parent
47b2f93a22
commit
15999428e4
40
multipath-tools-use-underscore-for-partnames
Normal file
40
multipath-tools-use-underscore-for-partnames
Normal file
@ -0,0 +1,40 @@
|
||||
diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules
|
||||
index f32c718..2746eff 100644
|
||||
--- a/kpartx/kpartx.rules
|
||||
+++ b/kpartx/kpartx.rules
|
||||
@@ -9,7 +9,7 @@ ACTION=="remove", GOTO="kpartx_end"
|
||||
|
||||
ENV{DM_TABLE_STATE}!="LIVE", GOTO="kpartx_end"
|
||||
|
||||
-ENV{DM_UUID}=="?*", IMPORT{program}=="/lib/udev/kpartx_id %M %m $env{DM_UUID}"
|
||||
+ENV{DM_UUID}=="?*", IMPORT{program}=="kpartx_id %M %m $env{DM_UUID}"
|
||||
|
||||
OPTIONS="link_priority=50"
|
||||
|
||||
@@ -18,7 +18,11 @@ ENV{DM_UUID}=="mpath-*", \
|
||||
SYMLINK+="disk/by-id/$env{DM_TYPE}-$env{DM_NAME}"
|
||||
|
||||
# Create persistent links for dmraid tables
|
||||
-ENV{DM_UUID}=="mpath-*", \
|
||||
+ENV{DM_UUID}=="dmraid-*", \
|
||||
+ SYMLINK+="disk/by-id/$env{DM_TYPE}-$env{DM_NAME}"
|
||||
+
|
||||
+# Create persistent links for linear tables
|
||||
+ENV{DM_UUID}=="linear-*", \
|
||||
SYMLINK+="disk/by-id/$env{DM_TYPE}-$env{DM_NAME}"
|
||||
|
||||
# Create persistent links for partitions
|
||||
@@ -27,11 +31,11 @@ ENV{DM_PART}=="?*", \
|
||||
|
||||
# Create dm tables for partitions
|
||||
ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="mpath-*", \
|
||||
- RUN+="/sbin/kpartx -a -p -part /dev/$kernel"
|
||||
+ RUN+="/sbin/kpartx -a -p _part /dev/$kernel"
|
||||
ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="dmraid-*", \
|
||||
- RUN+="/sbin/kpartx -a -p -part /dev/$kernel"
|
||||
+ RUN+="/sbin/kpartx -a -p _part /dev/$kernel"
|
||||
ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="linear-*", \
|
||||
RUN+="/sbin/kpartx -a -p _part /dev/$kernel"
|
||||
|
||||
LABEL="kpartx_end"
|
||||
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri May 9 13:25:30 CEST 2008 - hare@suse.de
|
||||
|
||||
- Fixup kpartx rules (bnc#387667)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 29 17:05:19 CEST 2008 - hare@suse.de
|
||||
|
||||
|
@ -20,7 +20,7 @@ Requires: device-mapper kpartx
|
||||
PreReq: %insserv_prereq %fillup_prereq coreutils grep diffutils
|
||||
AutoReqProv: on
|
||||
Version: 0.4.7
|
||||
Release: 118
|
||||
Release: 122
|
||||
Summary: Tools to Manage Multipathed Devices with the device-mapper
|
||||
Source: multipath-tools-%{version}.tar.bz2
|
||||
Source1: multipath.init.suse
|
||||
@ -38,6 +38,7 @@ Patch9: %{name}-add-cciss-tur
|
||||
Patch10: %{name}-remove-DAEMON-defines
|
||||
Patch11: %{name}-suse-build-fixes
|
||||
Patch12: %{name}-add-dm_linear
|
||||
Patch13: %{name}-use-underscore-for-partnames
|
||||
|
||||
%description
|
||||
This package provides the tools to manage multipathed devices by
|
||||
@ -91,6 +92,7 @@ Authors:
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
%patch13 -p1
|
||||
cp %{S:1} multipath/multipath.init.suse
|
||||
|
||||
%build
|
||||
@ -148,6 +150,8 @@ mkdir -p $RPM_BUILD_ROOT/var/cache/multipath/
|
||||
%{_mandir}/man8/kpartx.8*
|
||||
|
||||
%changelog
|
||||
* Fri May 09 2008 hare@suse.de
|
||||
- Fixup kpartx rules (bnc#387667)
|
||||
* Tue Apr 29 2008 hare@suse.de
|
||||
- Merge in fixes from upstream
|
||||
- Merge fixes from SLES10 SP2
|
||||
|
@ -91,7 +91,7 @@ case "$1" in
|
||||
rc_failed 1
|
||||
break;
|
||||
fi
|
||||
/sbin/kpartx -a -p -part /dev/dm-$map
|
||||
/sbin/kpartx -a -p _part /dev/dm-$map
|
||||
done
|
||||
|
||||
# Remember status and be verbose
|
||||
|
Loading…
x
Reference in New Issue
Block a user