6c3b05c927
- Update patch
- bug-1184687_Add-nolvm-for-kernel-cmdline.patch
- update lvm2.spec
- add '--disable-silent-rules' for verbose building, this option was
mistakenly removed on last commit.
- remove config item '--enable-realtime', which became default setting.
- add config item "--enable-dmfilemapd" for new daemon dmfilemapd
- lvm.conf
- align upstream style, comment out default values
OBS-URL: https://build.opensuse.org/request/show/1001122
OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=313
53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
From 6ebef9ad80ee156285a61d413b5265de9c0aa2ae Mon Sep 17 00:00:00 2001
|
|
From: Heming Zhao <heming.zhao@suse.com>
|
|
Date: Wed, 21 Apr 2021 11:17:36 +0800
|
|
Subject: [PATCH] Add "nolvm" for kernel cmdline
|
|
|
|
This patch is inspried by multipath patch cd3184e107c8 ("Add
|
|
support for "multipath=off" and "nompath" on kernel cmdline")
|
|
|
|
This new item for disabling lvm2 startup from kernel command
|
|
line. One of usecases is in rescue mode, disabling lvm2 will
|
|
allow user to enable lvm2 devices by manual.
|
|
|
|
Signed-off-by: Heming Zhao <heming.zhao@suse.com>
|
|
---
|
|
|
|
diff -Nupr a/scripts/lvm2-pvscan.service.in b/scripts/lvm2-pvscan.service.in
|
|
--- a/scripts/lvm2-pvscan.service.in 2022-09-02 14:05:03.706825230 +0800
|
|
+++ b/scripts/lvm2-pvscan.service.in 2022-09-02 14:04:09.115063287 +0800
|
|
@@ -7,6 +7,7 @@ BindsTo=dev-block-%i.device
|
|
After=multipathd.service
|
|
Before=shutdown.target
|
|
Conflicts=shutdown.target
|
|
+ConditionKernelCommandLine=!nolvm
|
|
|
|
[Service]
|
|
Type=oneshot
|
|
diff -Nupr a/udev/69-dm-lvm-metad.rules.in b/udev/69-dm-lvm-metad.rules.in
|
|
--- a/udev/69-dm-lvm-metad.rules.in 2022-09-02 14:04:42.618917180 +0800
|
|
+++ b/udev/69-dm-lvm-metad.rules.in 2022-09-02 14:03:39.707191529 +0800
|
|
@@ -12,6 +12,9 @@ SUBSYSTEM!="block", GOTO="lvm_end"
|
|
|
|
ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="lvm_end"
|
|
|
|
+IMPORT{cmdline}="nolvm"
|
|
+ENV{nolvm}=="?*", GOTO="lvm_end"
|
|
+
|
|
# Detect removed PV label by comparing previous ID_FS_TYPE value with current one.
|
|
ENV{.ID_FS_TYPE_NEW}="$env{ID_FS_TYPE}"
|
|
IMPORT{db}="ID_FS_TYPE"
|
|
diff -Nupr a/udev/69-dm-lvm.rules.in b/udev/69-dm-lvm.rules.in
|
|
--- a/udev/69-dm-lvm.rules.in 2022-09-02 14:04:51.074880312 +0800
|
|
+++ b/udev/69-dm-lvm.rules.in 2022-09-02 14:07:19.978230990 +0800
|
|
@@ -10,6 +10,9 @@ SUBSYSTEM!="block", GOTO="lvm_end"
|
|
|
|
ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="lvm_end"
|
|
|
|
+IMPORT{cmdline}="nolvm"
|
|
+ENV{nolvm}=="?*", GOTO="lvm_end"
|
|
+
|
|
# Only process devices already marked as a PV - this requires blkid to be called before.
|
|
ENV{ID_FS_TYPE}!="LVM2_member", GOTO="lvm_end"
|
|
ENV{DM_MULTIPATH_DEVICE_PATH}=="1", GOTO="lvm_end"
|