@@ -1133,26 +1133,34 @@ install_multipath() {
11331133}
11341134
11351135install_lvm () {
1136+ local lvm_rules rule_prefix
1137+
11361138 image_install lvm
11371139 image_install " ${ROOTLIBDIR:? } " /system/lvm2-lvmpolld.{service,socket}
11381140 image_install " ${ROOTLIBDIR:? } " /system/{blk-availability,lvm2-monitor}.service
11391141 image_install -o " /lib/tmpfiles.d/lvm2.conf"
1142+
11401143 if get_bool " $LOOKS_LIKE_DEBIAN " ; then
1141- inst_rules 56-lvm.rules 69-lvm-metad.rules
1144+ lvm_rules=" 56-lvm.rules"
1145+ rule_prefix=" "
11421146 else
1143- # Support the new udev autoactivation introduced in lvm 2.03.14
1144- # https://sourceware.org/git/?p=lvm2.git;a=commit;h=67722b312390cdab29c076c912e14bd739c5c0f6
1145- # Static autoactivation (via lvm2-activation-generator) was dropped
1146- # in lvm 2.03.15
1147- # https://sourceware.org/git/?p=lvm2.git;a=commit;h=ee8fb0310c53ed003a43b324c99cdfd891dd1a7c
1148- if [[ -f /lib/udev/rules.d/69-dm-lvm.rules ]]; then
1149- inst_rules 11-dm-lvm.rules 69-dm-lvm.rules
1150- else
1151- image_install " ${ROOTLIBDIR:? } " /system-generators/lvm2-activation-generator
1152- image_install
" ${ROOTLIBDIR:? } " /system/
[email protected] 1153- inst_rules 11-dm-lvm.rules 69-dm-lvm-metad.rules
1154- fi
1147+ lvm_rules=" 11-dm-lvm.rules"
1148+ rule_prefix=" dm-"
11551149 fi
1150+
1151+ # Support the new udev autoactivation introduced in lvm 2.03.14
1152+ # https://sourceware.org/git/?p=lvm2.git;a=commit;h=67722b312390cdab29c076c912e14bd739c5c0f6
1153+ # Static autoactivation (via lvm2-activation-generator) was dropped
1154+ # in lvm 2.03.15
1155+ # https://sourceware.org/git/?p=lvm2.git;a=commit;h=ee8fb0310c53ed003a43b324c99cdfd891dd1a7c
1156+ if [[ -f " /lib/udev/rules.d/69-${rule_prefix} lvm.rules" ]]; then
1157+ inst_rules " $lvm_rules " " 69-${rule_prefix} lvm.rules"
1158+ else
1159+ image_install " ${ROOTLIBDIR:? } " /system-generators/lvm2-activation-generator
1160+ image_install
" ${ROOTLIBDIR:? } " /system/
[email protected] 1161+ inst_rules " $lvm_rules " " 69-${rule_prefix} lvm-metad.rules"
1162+ fi
1163+
11561164 mkdir -p " ${initdir:? } /etc/lvm"
11571165}
11581166
0 commit comments