diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2021-11-01 20:55:38 +0100 |
|---|---|---|
| committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2021-11-01 20:55:38 +0100 |
| commit | e50d743f99fa66c9f55e534c4e109a2cf6323f04 (patch) | |
| tree | 9c473163f6fee68aaf7661e5fac863d3d9bd8b75 /test/test-functions | |
| parent | 222cd15654fda4ec9d58f866ab57861ab19f5920 (diff) | |
| download | systemd-e50d743f99fa66c9f55e534c4e109a2cf6323f04.tar.gz | |
test: support the new lvm udev autoactivation
Introduced in lvm 2.03.14.
See: https://sourceware.org/git/?p=lvm2.git;a=commit;h=67722b312390cdab29c076c912e14bd739c5c0f6
Diffstat (limited to 'test/test-functions')
| -rw-r--r-- | test/test-functions | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/test/test-functions b/test/test-functions index 79a7f5a71c..00a808bf28 100644 --- a/test/test-functions +++ b/test/test-functions @@ -951,13 +951,20 @@ install_multipath() { install_lvm() { image_install lvm image_install "${ROOTLIBDIR:?}"/system/lvm2-lvmpolld.{service,socket} - image_install "${ROOTLIBDIR:?}"/system/{blk-availability,lvm2-monitor,lvm2-pvscan@}.service + image_install "${ROOTLIBDIR:?}"/system/{blk-availability,lvm2-monitor}.service image_install "${ROOTLIBDIR:?}"/system-generators/lvm2-activation-generator image_install -o "/lib/tmpfiles.d/lvm2.conf" if get_bool "$LOOKS_LIKE_DEBIAN"; then inst_rules 56-lvm.rules 69-lvm-metad.rules else - inst_rules 11-dm-lvm.rules 69-dm-lvm-metad.rules + # Support the new udev autoactivation introduced in lvm 2.03.14 + # https://sourceware.org/git/?p=lvm2.git;a=commit;h=67722b312390cdab29c076c912e14bd739c5c0f6 + if [[ -f /lib/udev/rules.d/69-dm-lvm.rules ]]; then + inst_rules 11-dm-lvm.rules 69-dm-lvm.rules + else + image_install "${ROOTLIBDIR:?}"/system/lvm2-pvscan@.service + inst_rules 11-dm-lvm.rules 69-dm-lvm-metad.rules + fi fi mkdir -p "${initdir:?}/etc/lvm" } |