Skip to content

Commit 850d3d7

Browse files
mrc0mmandbluca
authored andcommitted
test: install all necessary units & generators for LVM on Debian
And derivates. Replaces: #30458 (cherry picked from commit f9ba9d3) (cherry picked from commit b1dba6b) (cherry picked from commit dc7bc3d)
1 parent 83137ed commit 850d3d7

File tree

1 file changed

+21
-13
lines changed

1 file changed

+21
-13
lines changed

test/test-functions

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,26 +1080,34 @@ install_multipath() {
10801080
}
10811081

10821082
install_lvm() {
1083+
local lvm_rules rule_prefix
1084+
10831085
image_install lvm
10841086
image_install "${ROOTLIBDIR:?}"/system/lvm2-lvmpolld.{service,socket}
10851087
image_install "${ROOTLIBDIR:?}"/system/{blk-availability,lvm2-monitor}.service
10861088
image_install -o "/lib/tmpfiles.d/lvm2.conf"
1089+
10871090
if get_bool "$LOOKS_LIKE_DEBIAN"; then
1088-
inst_rules 56-lvm.rules 69-lvm-metad.rules
1091+
lvm_rules="56-lvm.rules"
1092+
rule_prefix=""
10891093
else
1090-
# Support the new udev autoactivation introduced in lvm 2.03.14
1091-
# https://sourceware.org/git/?p=lvm2.git;a=commit;h=67722b312390cdab29c076c912e14bd739c5c0f6
1092-
# Static autoactivation (via lvm2-activation-generator) was dropped
1093-
# in lvm 2.03.15
1094-
# https://sourceware.org/git/?p=lvm2.git;a=commit;h=ee8fb0310c53ed003a43b324c99cdfd891dd1a7c
1095-
if [[ -f /lib/udev/rules.d/69-dm-lvm.rules ]]; then
1096-
inst_rules 11-dm-lvm.rules 69-dm-lvm.rules
1097-
else
1098-
image_install "${ROOTLIBDIR:?}"/system-generators/lvm2-activation-generator
1099-
image_install "${ROOTLIBDIR:?}"/system/[email protected]
1100-
inst_rules 11-dm-lvm.rules 69-dm-lvm-metad.rules
1101-
fi
1094+
lvm_rules="11-dm-lvm.rules"
1095+
rule_prefix="dm-"
11021096
fi
1097+
1098+
# Support the new udev autoactivation introduced in lvm 2.03.14
1099+
# https://sourceware.org/git/?p=lvm2.git;a=commit;h=67722b312390cdab29c076c912e14bd739c5c0f6
1100+
# Static autoactivation (via lvm2-activation-generator) was dropped
1101+
# in lvm 2.03.15
1102+
# https://sourceware.org/git/?p=lvm2.git;a=commit;h=ee8fb0310c53ed003a43b324c99cdfd891dd1a7c
1103+
if [[ -f "/lib/udev/rules.d/69-${rule_prefix}lvm.rules" ]]; then
1104+
inst_rules "$lvm_rules" "69-${rule_prefix}lvm.rules"
1105+
else
1106+
image_install "${ROOTLIBDIR:?}"/system-generators/lvm2-activation-generator
1107+
image_install "${ROOTLIBDIR:?}"/system/[email protected]
1108+
inst_rules "$lvm_rules" "69-${rule_prefix}lvm-metad.rules"
1109+
fi
1110+
11031111
mkdir -p "${initdir:?}/etc/lvm"
11041112
}
11051113

0 commit comments

Comments
 (0)