From cb6dc6148c6c627cd1e98d40414db57383470ff5 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Sat, 21 Dec 2019 13:48:31 -0500
Subject: [PATCH] systemd: generator: mv reboot flag file creation to generator

We can't wait until the service runs to create the flag file
(`/run/coreos-installer-reboot`) because systemd unit conditions
are evaluated way before the coreos-installer.service runs. Let's
do it in the generator instead.
---
 systemd/coreos-installer-generator | 13 +++++++++++++
 systemd/coreos-installer-service   |  4 ----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/systemd/coreos-installer-generator b/systemd/coreos-installer-generator
index bf2466b29..c66737e53 100755
--- a/systemd/coreos-installer-generator
+++ b/systemd/coreos-installer-generator
@@ -17,7 +17,20 @@ karg() {
     echo "${value}"
 }
 
+karg_bool() {
+    local value=$(karg "$@")
+    case "$value" in
+        ""|0|no|off) return 1;;
+        *) return 0;;
+    esac
+}
+
 if [ -n "$(karg coreos.inst.install_dev)" ]; then
     ln -sf "/usr/lib/systemd/system/coreos-installer.target" \
         "${UNIT_DIR}/default.target"
+
+    # Create precondition for coreos-installer-reboot.service if requested
+    if ! karg_bool coreos.inst.skip_reboot; then
+        touch /run/coreos-installer-reboot
+    fi
 fi
diff --git a/systemd/coreos-installer-service b/systemd/coreos-installer-service
index be1a79ba3..479870486 100755
--- a/systemd/coreos-installer-service
+++ b/systemd/coreos-installer-service
@@ -112,7 +112,3 @@ udevadm settle
 echo "coreos-installer ${args[@]}"
 coreos-installer "${args[@]}"
 
-# Create precondition for coreos-installer-reboot.service if requested
-if ! karg_bool coreos.inst.skip_reboot; then
-    touch /run/coreos-installer-reboot
-fi