From ec81125943b04b5e1906536dcbbb52b8da7f3fc7 Mon Sep 17 00:00:00 2001
From: Stephen Lowrie <stephen.lowrie@gmail.com>
Date: Fri, 19 Jul 2019 15:25:07 -0500
Subject: [PATCH] dracut/30ignition: support `coreos.no_persist_ip`

When `coreos.no_persist_ip` is not specified in a true value persist
ifcfg files created by the `write-ifcfg.sh` script run as part of the
dracut `45ifcfg` module to the real root.
---
 dracut/30ignition/module-setup.sh  |  2 ++
 dracut/30ignition/persist-ifcfg.sh | 30 ++++++++++++++++++++++++++++++
 grub/02_ignition_firstboot         |  2 +-
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 dracut/30ignition/persist-ifcfg.sh

diff --git a/dracut/30ignition/module-setup.sh b/dracut/30ignition/module-setup.sh
index 61726d1..a46f718 100755
--- a/dracut/30ignition/module-setup.sh
+++ b/dracut/30ignition/module-setup.sh
@@ -68,6 +68,8 @@ install() {
 
     # needed for openstack config drive support
     inst_rules 60-cdrom_id.rules
+
+    inst_hook pre-pivot 90 "$moddir/persist-ifcfg.sh"
 }
 
 has_fw_cfg_module() {
diff --git a/dracut/30ignition/persist-ifcfg.sh b/dracut/30ignition/persist-ifcfg.sh
new file mode 100644
index 0000000..e961932
--- /dev/null
+++ b/dracut/30ignition/persist-ifcfg.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+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}"
+}
+
+cmdline_bool() {
+    local value=$(cmdline_arg "$@")
+    case "$value" in
+        ""|0|no|off) return 1;;
+        *) return 0;;
+    esac
+}
+
+if ! $(cmdline_bool 'coreos.no_persist_ip' 0); then
+    cp /tmp/ifcfg/* /sysroot/etc/sysconfig/network-scripts/
+fi
+
diff --git a/grub/02_ignition_firstboot b/grub/02_ignition_firstboot
index cb54e79..6d6cff5 100755
--- a/grub/02_ignition_firstboot
+++ b/grub/02_ignition_firstboot
@@ -20,5 +20,5 @@ if [ -f "(${bootpart})/ignition.firstboot" ]; then
     source "(${bootpart})/ignition.firstboot"
     
     # we support setting variables in the 
-    set ignition_firstboot="ignition.firstboot $ignition_network_kcmdline"
+    set ignition_firstboot="ignition.firstboot $ignition_network_kcmdline $ignition_extra_kcmdline"
 fi