diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2022-02-09 22:35:03 +0100 |
|---|---|---|
| committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2022-02-09 22:36:25 +0100 |
| commit | d10d562bd4b9f93130fb2b23f2b0d0d4126ea7d4 (patch) | |
| tree | 0c56f9f4e8a7688353047a37c02f19f264dec871 /test/test-functions | |
| parent | Clarify protocol used in systemd-journal-upload (#22465) (diff) | |
| download | systemd-d10d562bd4b9f93130fb2b23f2b0d0d4126ea7d4.tar.xz systemd-d10d562bd4b9f93130fb2b23f2b0d0d4126ea7d4.zip | |
test: lvm 2.03.15 dropped the static autoactivation
so install the respective generator only if we're running with older
lvm versions.
See: https://sourceware.org/git/?p=lvm2.git;a=commit;h=ee8fb0310c53ed003a43b324c99cdfd891dd1a7c
Diffstat (limited to 'test/test-functions')
| -rw-r--r-- | test/test-functions | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/test-functions b/test/test-functions index d79c52c591..a7b0be0c2b 100644 --- a/test/test-functions +++ b/test/test-functions @@ -985,16 +985,19 @@ install_lvm() { image_install lvm image_install "${ROOTLIBDIR:?}"/system/lvm2-lvmpolld.{service,socket} 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 # Support the new udev autoactivation introduced in lvm 2.03.14 # https://sourceware.org/git/?p=lvm2.git;a=commit;h=67722b312390cdab29c076c912e14bd739c5c0f6 + # Static autoactivation (via lvm2-activation-generator) was dropped + # in lvm 2.03.15 + # https://sourceware.org/git/?p=lvm2.git;a=commit;h=ee8fb0310c53ed003a43b324c99cdfd891dd1a7c 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-generators/lvm2-activation-generator image_install "${ROOTLIBDIR:?}"/system/lvm2-pvscan@.service inst_rules 11-dm-lvm.rules 69-dm-lvm-metad.rules fi |