From 88012850661b8fef9923e2f99fb28613ebeff9ca Mon Sep 17 00:00:00 2001
From: Kai Lueke <kailuke@microsoft.com>
Date: Wed, 4 Oct 2023 16:17:26 +0200
Subject: [PATCH] wip

---
 .../10diskless-generator/diskless-generator   | 26 +++++++++++++++++++
 dracut/30ignition/ignition-files.service      |  3 ++-
 dracut/30ignition/ignition-mount.service      |  1 +
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/dracut/10diskless-generator/diskless-generator b/dracut/10diskless-generator/diskless-generator
index d5381b5..b2fca01 100755
--- a/dracut/10diskless-generator/diskless-generator
+++ b/dracut/10diskless-generator/diskless-generator
@@ -25,6 +25,13 @@ add_requires() {
     ln -sf "../${name}" "${requires_dir}/${name}"
 }
 
+add_wants() {
+    local name="$1"
+    local wants_dir="${UNIT_DIR}/initrd-root-fs.target.wants"
+    mkdir -p "${wants_dir}"
+    ln -sf "../${name}" "${wants_dir}/${name}"
+}
+
 # set to 1 to enable copying /oem from the initrd
 copy_oem=0
 # check both the new mount.usr and our old usr kernel options
@@ -32,6 +39,8 @@ usr=$(cmdline_arg mount.usr "$(cmdline_arg usr)")
 root=$(cmdline_arg root)
 rootfstype=$(cmdline_arg rootfstype tmpfs)
 rootflags=$(cmdline_arg rootflags)
+# check possible future systemd support for separate "/var"
+var=$(cmdline_arg mount.var)
 
 # If usr= was not specified and a squashfs is bundled in the initrd use it.
 if [[ -z "${usr}" && -f /usr.squashfs ]]; then
@@ -151,3 +160,20 @@ Type=auto
 Options=nodev
 EOF
 fi
+
+if [[ -z "${var}" ]]; then
+    add_wants sysroot-oem.mount
+    cat >"${UNIT_DIR}/sysroot-var.mount" <<EOF
+# Automatically generated by diskless-generator
+
+[Unit]
+ConditionPathExists=/dev/disk/by-label/VAR
+Before=initrd-root-fs.target
+
+[Mount]
+What=/dev/disk/by-label/VAR
+Where=/sysroot/var
+Type=auto
+Options=rw
+EOF
+fi
diff --git a/dracut/30ignition/ignition-files.service b/dracut/30ignition/ignition-files.service
index b0c11b6..690e846 100644
--- a/dracut/30ignition/ignition-files.service
+++ b/dracut/30ignition/ignition-files.service
@@ -15,7 +15,7 @@ Requires=initrd-setup-root.service
 After=initrd-setup-root.service
 # Already mount the OEM partition here so that it works to write files
 # without having to declare it as initrd mount in Ignition
-RequiresMountsFor=/sysroot/usr/ /sysroot/oem/
+RequiresMountsFor=/sysroot/usr/ /sysroot/oem/ /sysroot/var/
 
 OnFailure=emergency.target
 OnFailureJobMode=isolate
@@ -32,4 +32,5 @@ RemainAfterExit=yes
 EnvironmentFile=/run/ignition.env
 # Flatcar: Make sure that the OEM mount point is there even if it shortly was away
 ExecStartPre=-systemctl start sysroot-oem.mount
+ExecStartPre=-systemctl start sysroot-var.mount
 ExecStart=/usr/bin/ignition --root=/sysroot --platform=${PLATFORM_ID} --stage=files --log-to-stdout
diff --git a/dracut/30ignition/ignition-mount.service b/dracut/30ignition/ignition-mount.service
index f129507..dc1d1c2 100644
--- a/dracut/30ignition/ignition-mount.service
+++ b/dracut/30ignition/ignition-mount.service
@@ -37,5 +37,6 @@ RemainAfterExit=yes
 EnvironmentFile=/run/ignition.env
 # Flatcar: Unmount any OEM mount in case the Ignition config has one defined
 ExecStartPre=/bin/bash -c 'if ! mount | grep -m 1 /sysroot/oem | grep tmpfs; then umount /sysroot/oem || true; fi'
+ExecStartPre=/bin/bash -c 'if mount | grep -m 1 /sysroot/var; then umount /sysroot/var || true; fi'
 ExecStart=/usr/bin/ignition --root=/sysroot --platform=${PLATFORM_ID} --stage=mount --log-to-stdout
 ExecStop=/usr/bin/ignition --root=/sysroot --platform=${PLATFORM_ID} --stage=umount --log-to-stdout