Moved variables from wwinit into init.ww

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

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