ignition: Create /run/ignition.env on every boot

dracut/30ignition/ignition-generator

@@ -98,14 +98,31 @@ else
         add_requires ignition-diskful-subsequent.target ignition-subsequent.target
     fi
 fi
+cat > ${UNIT_DIR}/ignition-setup-pre.service <<EOF
+[Unit]
+Description=Ignition env setup
+DefaultDependencies=false
+
+Requires=local-fs-pre.target
+Before=local-fs-pre.target
+
+OnFailure=emergency.target
+OnFailureJobMode=isolate
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/sbin/ignition-setup-pre
+EOF
+
 cat > ${UNIT_DIR}/ignition-setup.service <<EOF
 [Unit]
 Description=Ignition (setup)
 DefaultDependencies=false
 
 # Flatcar: Load Ignition binary
-Requires=sysusr-usr.mount
-After=sysusr-usr.mount
+Requires=sysusr-usr.mount ignition-setup-pre.service
+After=sysusr-usr.mount ignition-setup-pre.service
 
 Requires=local-fs-pre.target
 Before=local-fs-pre.target

dracut/30ignition/ignition-setup-pre.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+# This is split out of the generator to not write to /run/ from it
+
+set -e
+
+cmdline=( $(</proc/cmdline) )
+cmdline_arg() {
+    local name="$1" value="$2"
+    for arg in "${cmdline[@]}"; do
+        if [[ "${arg%%=*}" == "${name}" ]]; then
+            value="${arg#*=}"
+        fi
+    done
+    echo "${value}"
+}
+
+oem_id=metal
+if [[ $(systemd-detect-virt || true) =~ ^(kvm|qemu)$ ]]; then
+    oem_id=qemu
+fi
+
+oem_cmdline="$(cmdline_arg flatcar.oem.id ${oem_id})"
+if [[ "${oem_id}" = "${oem_cmdline}" ]]; then
+    oem_cmdline="$(cmdline_arg coreos.oem.id ${oem_id})"
+fi
+
+# Ignition changed the platform name to "aws"
+if [ "${oem_cmdline}" = "ec2" ]; then
+  oem_cmdline="aws"
+fi
+
+# Ignition changed the platform name to "gcp"
+if [ "${oem_cmdline}" = "gce" ]; then
+  oem_cmdline="gcp"
+fi
+
+# To maintain compatibility with eventual legacy 'flatcar.oem.id=pxe'
+if [ "${oem_cmdline}" = "pxe" ]; then
+  oem_cmdline="metal"
+fi
+
+{ echo "OEM_ID=${oem_cmdline}" ; echo "PLATFORM_ID=${oem_cmdline}" ; } > /run/ignition.env

dracut/30ignition/ignition-setup.sh

@@ -35,41 +35,3 @@ fi
 if [[ -e "${src}/config.ign" ]]; then
     cp "${src}/config.ign" "${dst}/user.ign"
 fi
-
-cmdline=( $(</proc/cmdline) )
-cmdline_arg() {
-    local name="$1" value="$2"
-    for arg in "${cmdline[@]}"; do
-        if [[ "${arg%%=*}" == "${name}" ]]; then
-            value="${arg#*=}"
-        fi
-    done
-    echo "${value}"
-}
-
-oem_id=metal
-if [[ $(systemd-detect-virt || true) =~ ^(kvm|qemu)$ ]]; then
-    oem_id=qemu
-fi
-
-oem_cmdline="$(cmdline_arg flatcar.oem.id ${oem_id})"
-if [[ "${oem_id}" = "${oem_cmdline}" ]]; then
-    oem_cmdline="$(cmdline_arg coreos.oem.id ${oem_id})"
-fi
-
-# Ignition changed the platform name to "aws"
-if [ "${oem_cmdline}" = "ec2" ]; then
-  oem_cmdline="aws"
-fi
-
-# Ignition changed the platform name to "gcp"
-if [ "${oem_cmdline}" = "gce" ]; then
-  oem_cmdline="gcp"
-fi
-
-# To maintain compatibility with eventual legacy 'flatcar.oem.id=pxe'
-if [ "${oem_cmdline}" = "pxe" ]; then
-  oem_cmdline="metal"
-fi
-
-{ echo "OEM_ID=${oem_cmdline}" ; echo "PLATFORM_ID=${oem_cmdline}" ; } > /run/ignition.env

dracut/30ignition/ignition-subsequent.target

@@ -8,8 +8,8 @@ ConditionPathExists=/etc/initrd-release
 Before=initrd.target
 
 # Run the generic rootfs setup helpers
-Requires=initrd-setup-root.service initrd-setup-root-after-ignition.service
-After=initrd-setup-root.service initrd-setup-root-after-ignition.service
+Requires=initrd-setup-root.service initrd-setup-root-after-ignition.service ignition-setup-pre.service
+After=initrd-setup-root.service initrd-setup-root-after-ignition.service ignition-setup-pre.service
 
 # Make sure we stop all the units before switching root
 Conflicts=initrd-switch-root.target umount.target

dracut/30ignition/module-setup.sh

@@ -74,6 +74,10 @@ install() {
     inst_script "$moddir/ignition-setup.sh" \
         "/usr/sbin/ignition-setup"
 
+    # Flatcar: add ignition-setup-pre
+    inst_script "$moddir/ignition-setup-pre.sh" \
+        "/usr/sbin/ignition-setup-pre"
+
     # Rule to allow udev to discover unformatted encrypted devices
     inst_simple "$moddir/99-xx-ignition-systemd-cryptsetup.rules" \
         "/usr/lib/udev/rules.d/99-xx-ignition-systemd-cryptsetup.rules"