[experimental] Upgrade dracut module: Update /usr mounting solution

repos/system_upgrade/common/actors/commonleappdracutmodules/files/dracut/85sys-upgrade-redhat/module-setup.sh

@@ -102,7 +102,6 @@ install() {
     inst_binary grep
 
     # script to actually run the upgrader binary
-    inst_hook upgrade 49 "$_moddir/mount_usr.sh"
     inst_hook upgrade 50 "$_moddir/do-upgrade.sh"
 
     #NOTE: some clean up?.. ideally, everything should be inside the leapp*

repos/system_upgrade/common/actors/commonleappdracutmodules/files/dracut/90sys-upgrade/initrd-cleanup-override.conf

@@ -0,0 +1,3 @@
+[Service]
+ExecStart=
+ExecStart=-/usr/bin/true

repos/system_upgrade/common/actors/commonleappdracutmodules/files/dracut/90sys-upgrade/module-setup.sh

@@ -54,6 +54,17 @@ install() {
         ln -sf "../${s}.service" "$upgrade_wantsdir"
     done
 
+    # Setup modified initrd-cleanup.service in the upgrade initramfs to enable
+    # storage initialisation using systemd-fstab-generator. We want to run the
+    # initrd-parse-etc.service but this one triggers also the initrd-cleanup.service
+    # which triggers the switch-root and isolated actions that basically kills
+    # the original upgrade service when used.
+    # The initrd-parse-etc.service has different content across RHEL systems,
+    # so we override rather initrd-cleanup.service instead as we do not need
+    # that one for the upgrade process.
+    mkdir -p "${unitdir}/initrd-cleanup.service.d"
+    inst_simple "${_moddir}/initrd-cleanup-override.conf" "${unitdir}/initrd-cleanup.service.d/initrd-cleanup-override.conf"
+
     # just try : set another services into the wantsdir
     #        sysroot.mount    \
     #        dracut-mount     \

repos/system_upgrade/common/actors/commonleappdracutmodules/files/dracut/90sys-upgrade/upgrade.target

@@ -2,7 +2,7 @@
 Description=System Upgrade
 Documentation=man:upgrade.target(7)
 # ##sysinit.target sockets.target initrd-root-fs.target initrd-root-device.target initrd-fs.target
-Wants=initrd-root-fs.target initrd-root-device.target initrd-fs.target initrd-usr-fs.target
+Wants=initrd-root-fs.target initrd-root-device.target initrd-fs.target initrd-usr-fs.target initrd-parse-etc.service
 Requires=basic.target sysroot.mount
-After=basic.target sysroot.mount
+After=basic.target sysroot.mount  initrd-fs.target
 AllowIsolate=yes