From 686e2fcd742037d3c5a9830fc89638b5e862242a Mon Sep 17 00:00:00 2001
From: wangjufeng <wangjufeng@huawei.com>
Date: Fri, 10 Jan 2020 11:57:08 +0800
Subject: [PATCH] kpartx: change kpartx file and default bindir

Change default bindir of multipath to /usr/sbin. Don't
set device name-partition number delimiter in kpartx rules.

Signed-off-by: wangjufeng <wangjufeng@huawei.com>
---
 Makefile.inc        | 2 +-
 kpartx/kpartx.rules | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index 2e25d2e..f17fa63 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -34,7 +34,7 @@ endif
 # Paths. All these can be overridden on the "make" command line.
 prefix		:=
 # Prefix for binaries
-exec_prefix	:= $(prefix)
+exec_prefix	:= $(prefix)/usr
 # Prefix for non-essential libraries (libdmmp)
 usr_prefix	:= $(prefix)
 # Where to install systemd-related files. systemd is usually installed under /usr
diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules
index 1969dee..d2b2823 100644
--- a/kpartx/kpartx.rules
+++ b/kpartx/kpartx.rules
@@ -39,6 +39,6 @@ LABEL="mpath_kpartx_end"
 GOTO="kpartx_end"
 
 LABEL="run_kpartx"
-RUN+="/sbin/kpartx -un -p -part /dev/$name"
+RUN+="/sbin/kpartx -un /dev/$name"
 
 LABEL="kpartx_end"
-- 
2.33.0