2021-11-23 21:49:34 +08:00
|
|
|
From 021d7687e208d0e01feec945bbde5ff0a5557463 Mon Sep 17 00:00:00 2001
|
2020-01-10 17:13:17 +08:00
|
|
|
From: wangjufeng <wangjufeng@huawei.com>
|
|
|
|
|
Date: Fri, 10 Jan 2020 11:57:08 +0800
|
2021-11-23 21:49:34 +08:00
|
|
|
Subject: [PATCH 13/15] kpartx: change kpartx file and default bindir
|
2020-01-10 17:13:17 +08:00
|
|
|
|
|
|
|
|
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
|
2021-11-23 21:49:34 +08:00
|
|
|
index 9944aa1..9913e7a 100644
|
2020-01-10 17:13:17 +08:00
|
|
|
--- a/Makefile.inc
|
|
|
|
|
+++ b/Makefile.inc
|
2021-11-23 21:49:34 +08:00
|
|
|
@@ -53,7 +53,7 @@ ifndef SYSTEMDPATH
|
2020-01-10 17:13:17 +08:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
prefix =
|
|
|
|
|
-exec_prefix = $(prefix)
|
|
|
|
|
+exec_prefix = $(prefix)/usr
|
|
|
|
|
usr_prefix = $(prefix)
|
|
|
|
|
bindir = $(exec_prefix)/sbin
|
|
|
|
|
libudevdir = $(prefix)/$(SYSTEMDPATH)/udev
|
|
|
|
|
diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules
|
2020-11-04 21:19:44 +08:00
|
|
|
index d7527d7..0e0d70d 100644
|
2020-01-10 17:13:17 +08:00
|
|
|
--- a/kpartx/kpartx.rules
|
|
|
|
|
+++ b/kpartx/kpartx.rules
|
2020-11-04 21:19:44 +08:00
|
|
|
@@ -36,6 +36,6 @@ LABEL="mpath_kpartx_end"
|
2020-01-10 17:13:17 +08:00
|
|
|
GOTO="kpartx_end"
|
|
|
|
|
|
|
|
|
|
LABEL="run_kpartx"
|
|
|
|
|
-RUN+="/sbin/kpartx -un -p -part /dev/$name"
|
|
|
|
|
+RUN+="/sbin/kpartx -un /dev/$name"
|
|
|
|
|
|
|
|
|
|
LABEL="kpartx_end"
|
|
|
|
|
--
|
|
|
|
|
1.8.3.1
|
|
|
|
|
|
