Skip to content

Commit 2b1cc75

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) (cherry picked from commit 850d3d7)
1 parent 42c2a34 commit 2b1cc75

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
@@ -1077,26 +1077,34 @@ install_multipath() {
10771077
}
10781078

10791079
install_lvm() {
1080+
local lvm_rules rule_prefix
1081+
10801082
image_install lvm
10811083
image_install "${ROOTLIBDIR:?}"/system/lvm2-lvmpolld.{service,socket}
10821084
image_install "${ROOTLIBDIR:?}"/system/{blk-availability,lvm2-monitor}.service
10831085
image_install -o "/lib/tmpfiles.d/lvm2.conf"
1086+
10841087
if get_bool "$LOOKS_LIKE_DEBIAN"; then
1085-
inst_rules 56-lvm.rules 69-lvm-metad.rules
1088+
lvm_rules="56-lvm.rules"
1089+
rule_prefix=""
10861090
else
1087-
# Support the new udev autoactivation introduced in lvm 2.03.14
1088-
# https://sourceware.org/git/?p=lvm2.git;a=commit;h=67722b312390cdab29c076c912e14bd739c5c0f6
1089-
# Static autoactivation (via lvm2-activation-generator) was dropped
1090-
# in lvm 2.03.15
1091-
# https://sourceware.org/git/?p=lvm2.git;a=commit;h=ee8fb0310c53ed003a43b324c99cdfd891dd1a7c
1092-
if [[ -f /lib/udev/rules.d/69-dm-lvm.rules ]]; then
1093-
inst_rules 11-dm-lvm.rules 69-dm-lvm.rules
1094-
else
1095-
image_install "${ROOTLIBDIR:?}"/system-generators/lvm2-activation-generator
1096-
image_install "${ROOTLIBDIR:?}"/system/[email protected]
1097-
inst_rules 11-dm-lvm.rules 69-dm-lvm-metad.rules
1098-
fi
1091+
lvm_rules="11-dm-lvm.rules"
1092+
rule_prefix="dm-"
10991093
fi
1094+
1095+
# Support the new udev autoactivation introduced in lvm 2.03.14
1096+
# https://sourceware.org/git/?p=lvm2.git;a=commit;h=67722b312390cdab29c076c912e14bd739c5c0f6
1097+
# Static autoactivation (via lvm2-activation-generator) was dropped
1098+
# in lvm 2.03.15
1099+
# https://sourceware.org/git/?p=lvm2.git;a=commit;h=ee8fb0310c53ed003a43b324c99cdfd891dd1a7c
1100+
if [[ -f "/lib/udev/rules.d/69-${rule_prefix}lvm.rules" ]]; then
1101+
inst_rules "$lvm_rules" "69-${rule_prefix}lvm.rules"
1102+
else
1103+
image_install "${ROOTLIBDIR:?}"/system-generators/lvm2-activation-generator
1104+
image_install "${ROOTLIBDIR:?}"/system/[email protected]
1105+
inst_rules "$lvm_rules" "69-${rule_prefix}lvm-metad.rules"
1106+
fi
1107+
11001108
mkdir -p "${initdir:?}/etc/lvm"
11011109
}
11021110

0 commit comments

Comments
 (0)