From 5598ec8a65e133821a8adadabd5837988c0522b6 Mon Sep 17 00:00:00 2001
From: Gregory Kurtzer <gmkurtzer@gmail.com>
Date: Sun, 20 Dec 2020 22:49:02 -0800
Subject: [PATCH] Moved variables from wwinit into init.ww

---
 overlays/system/default/init.ww                      | 12 ++++++++++--
 .../system/default/warewulf/{wwinit.ww => wwinit}    |  5 +++--
 2 files changed, 13 insertions(+), 4 deletions(-)
 rename overlays/system/default/warewulf/{wwinit.ww => wwinit} (86%)

diff --git a/overlays/system/default/init.ww b/overlays/system/default/init.ww
index cd231ee7..05f90175 100755
--- a/overlays/system/default/init.ww
+++ b/overlays/system/default/init.ww
@@ -6,15 +6,23 @@
 # Edit at your own risk! DANGER DANGER.
 
 WWCONTAINER={{$.Container}}
+export WWCONTAINER
 WWHOSTNAME={{$.Id}}
+export WWHOSTNAME
 WWROOT={{$.Root}}
+export WWROOT
+WWINIT={{$.Init}}
+export WWINIT
 WWIPMI_IPADDR="{{$.IpmiIpaddr}}"
+export WWIPMI_IPADDR
 WWIPMI_NETMASK="{{$.IpmiNetmask}}"
+export WWIPMI_NETMASK
 WWIPMI_GATEWAY="{{$.IpmiGateway}}"
+export WWIPMI_GATEWAY
 WWIPMI_USER="{{$.IpmiUserName}}"
+export WWIPMI_USER
 WWIPMI_PASSWORD="{{$.IpmiPassword}}"
-
-export WWCONTAINER WWHOSTNAME WWROOT
+export WWIPMI_PASSWORD
 
 echo "Warewulf v4 is now booting: $WWHOSTNAME"
 echo
diff --git a/overlays/system/default/warewulf/wwinit.ww b/overlays/system/default/warewulf/wwinit
similarity index 86%
rename from overlays/system/default/warewulf/wwinit.ww
rename to overlays/system/default/warewulf/wwinit
index 0a8c94fa..73ec6a9b 100644
--- a/overlays/system/default/warewulf/wwinit.ww
+++ b/overlays/system/default/warewulf/wwinit
@@ -14,14 +14,15 @@ echo "Cleaning up"
 unset WWCONTAINER
 unset WWHOSTNAME
 unset WWROOT
+unset WWINIT
 unset WWIPMI_IPADDR
 unset WWIPMI_NETMASK
 unset WWIPMI_GATEWAY
 unset WWIPMI_USER
 unset WWIPMI_PASSWORD
 
-echo "Calling {{$.Init}}..."
+echo "Calling $WWINIT..."
 echo
 
 sleep 2
-exec {{$.Init}}
+exec $WWINIT