@@ -1167,26 +1167,34 @@ install_multipath() {
11671167}
11681168
11691169install_lvm () {
1170+ local lvm_rules rule_prefix
1171+
11701172 image_install lvm
11711173 image_install " ${ROOTLIBDIR:? } " /system/lvm2-lvmpolld.{service,socket}
11721174 image_install " ${ROOTLIBDIR:? } " /system/{blk-availability,lvm2-monitor}.service
11731175 image_install -o " /lib/tmpfiles.d/lvm2.conf"
1176+
11741177 if get_bool " $LOOKS_LIKE_DEBIAN " ; then
1175- inst_rules 56-lvm.rules 69-lvm-metad.rules
1178+ lvm_rules=" 56-lvm.rules"
1179+ rule_prefix=" "
11761180 else
1177- # Support the new udev autoactivation introduced in lvm 2.03.14
1178- # https://sourceware.org/git/?p=lvm2.git;a=commit;h=67722b312390cdab29c076c912e14bd739c5c0f6
1179- # Static autoactivation (via lvm2-activation-generator) was dropped
1180- # in lvm 2.03.15
1181- # https://sourceware.org/git/?p=lvm2.git;a=commit;h=ee8fb0310c53ed003a43b324c99cdfd891dd1a7c
1182- if [[ -f /lib/udev/rules.d/69-dm-lvm.rules ]]; then
1183- inst_rules 11-dm-lvm.rules 69-dm-lvm.rules
1184- else
1185- image_install " ${ROOTLIBDIR:? } " /system-generators/lvm2-activation-generator
1186- image_install
" ${ROOTLIBDIR:? } " /system/
[email protected] 1187- inst_rules 11-dm-lvm.rules 69-dm-lvm-metad.rules
1188- fi
1181+ lvm_rules=" 11-dm-lvm.rules"
1182+ rule_prefix=" dm-"
11891183 fi
1184+
1185+ # Support the new udev autoactivation introduced in lvm 2.03.14
1186+ # https://sourceware.org/git/?p=lvm2.git;a=commit;h=67722b312390cdab29c076c912e14bd739c5c0f6
1187+ # Static autoactivation (via lvm2-activation-generator) was dropped
1188+ # in lvm 2.03.15
1189+ # https://sourceware.org/git/?p=lvm2.git;a=commit;h=ee8fb0310c53ed003a43b324c99cdfd891dd1a7c
1190+ if [[ -f " /lib/udev/rules.d/69-${rule_prefix} lvm.rules" ]]; then
1191+ inst_rules " $lvm_rules " " 69-${rule_prefix} lvm.rules"
1192+ else
1193+ image_install " ${ROOTLIBDIR:? } " /system-generators/lvm2-activation-generator
1194+ image_install
" ${ROOTLIBDIR:? } " /system/
[email protected] 1195+ inst_rules " $lvm_rules " " 69-${rule_prefix} lvm-metad.rules"
1196+ fi
1197+
11901198 mkdir -p " ${initdir:? } /etc/lvm"
11911199}
11921200
0 commit comments