Merge pull request #22467 from mrc0mmand/TEST-64-lvm-static-autoactivation

test: lvm 2.03.15 dropped the static autoactivation

man/systemd-journal-upload.service.xml

@@ -46,6 +46,9 @@
     the program is running as will be uploaded, and then the program will wait and send new entries
     as they become available.</para>
     
+    <para><command>systemd-journal-upload</command> transfers the raw content of journal file and
+    uses HTTP as a transport protocol.</para> 
+    
     <para><filename>systemd-journal-upload.service</filename> is a system service that uses
     <command>systemd-journal-upload</command> to upload journal entries to a server. It uses the
     configuration in

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