ignition-ostree-rootfs: use our own tmpfs with size=80%

kola-denylist.yaml

@@ -12,10 +12,3 @@
   streams:
     - next
     - next-devel
-# The ext.config.root-reprovision* tests are failing on Fedora 33
-# for now. Exclude running the test on `next` and `next-devel`.
-- pattern: ext.config.root-reprovision.*
-  tracker: https://github.com/coreos/fedora-coreos-tracker/issues/644
-  streams:
-    - next
-    - next-devel

overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-dracut-rootfs.sh

@@ -17,6 +17,10 @@ case "${1:-}" in
         fi
         echo "Detected rootfs replacement in fetched Ignition config: /run/ignition.json"
         mkdir "${saved_sysroot}"
+        # use 80% of RAM: we want to be greedy since the boot breaks anyway, but
+        # we still want to leave room for everything else so it hits ENOSPC and
+        # doesn't invoke the OOM killer
+        mount -t tmpfs tmpfs "${saved_sysroot}" -o size=80%
         ;;
     save)
         mount "${rootdisk}" /sysroot
@@ -29,10 +33,15 @@ case "${1:-}" in
         # This one is in a private mount namespace since we're not "offically" mounting
         mount "${rootdisk}" /sysroot
         echo "Restoring rootfs from RAM..."
-        cd "${saved_sysroot}"
-        find . -mindepth 1 -maxdepth 1 -exec mv -t /sysroot {} \;
+        find "${saved_sysroot}" -mindepth 1 -maxdepth 1 -exec mv -t /sysroot {} \;
         chattr +i $(ls -d /sysroot/ostree/deploy/*/deploy/*/)
         ;;
+    cleanup)
+        if [ -d "${saved_sysroot}" ]; then
+            umount "${saved_sysroot}"
+            rm -rf "${saved_sysroot}" "${partstate}"
+        fi
+        ;;
     *)
         echo "Unsupported operation: ${1:-}" 1>&2; exit 1
         ;;

overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-rootfs-detect.service

@@ -14,5 +14,5 @@ After=systemd-udevd.service
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-EnvironmentFile=/run/ignition.env
 ExecStart=/usr/libexec/ignition-ostree-dracut-rootfs detect
+ExecStop=/usr/libexec/ignition-ostree-dracut-rootfs cleanup

overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-rootfs-restore.service

@@ -11,7 +11,6 @@ ConditionPathIsDirectory=/run/ignition-ostree-rootfs
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-EnvironmentFile=/run/ignition.env
 # So we can transiently mount sysroot
 MountFlags=slave
 ExecStart=/usr/libexec/ignition-ostree-dracut-rootfs restore

overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-rootfs-save.service

@@ -12,7 +12,6 @@ After=coreos-gpt-setup.service
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-EnvironmentFile=/run/ignition.env
 # So we can transiently mount sysroot
 MountFlags=slave
 ExecStart=/usr/libexec/ignition-ostree-dracut-rootfs save