kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Moved variables from wwinit into init.ww

Browse Source
This commit is contained in:
Gregory Kurtzer
2020-12-20 22:49:02 -08:00
parent e5be3d8182
commit 5598ec8a65
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
overlays/system/default/init.ww
View File

@@ -6,15 +6,23 @@
# Edit at your own risk! DANGER DANGER. # Edit at your own risk! DANGER DANGER.
WWCONTAINER={{$.Container}} WWCONTAINER={{$.Container}}
export WWCONTAINER
WWHOSTNAME={{$.Id}} WWHOSTNAME={{$.Id}}
export WWHOSTNAME
WWROOT={{$.Root}} WWROOT={{$.Root}}
export WWROOT
WWINIT={{$.Init}}
export WWINIT
WWIPMI_IPADDR="{{$.IpmiIpaddr}}" WWIPMI_IPADDR="{{$.IpmiIpaddr}}"
export WWIPMI_IPADDR
WWIPMI_NETMASK="{{$.IpmiNetmask}}" WWIPMI_NETMASK="{{$.IpmiNetmask}}"
export WWIPMI_NETMASK
WWIPMI_GATEWAY="{{$.IpmiGateway}}" WWIPMI_GATEWAY="{{$.IpmiGateway}}"
export WWIPMI_GATEWAY
WWIPMI_USER="{{$.IpmiUserName}}" WWIPMI_USER="{{$.IpmiUserName}}"
export WWIPMI_USER
WWIPMI_PASSWORD="{{$.IpmiPassword}}" WWIPMI_PASSWORD="{{$.IpmiPassword}}"
export WWIPMI_PASSWORD
export WWCONTAINER WWHOSTNAME WWROOT
echo "Warewulf v4 is now booting: $WWHOSTNAME" echo "Warewulf v4 is now booting: $WWHOSTNAME"
echo echo

5
overlays/system/default/warewulf/wwinit.ww → overlays/system/default/warewulf/wwinit
View File

@@ -14,14 +14,15 @@ echo "Cleaning up"
unset WWCONTAINER unset WWCONTAINER
unset WWHOSTNAME unset WWHOSTNAME
unset WWROOT unset WWROOT
unset WWINIT
unset WWIPMI_IPADDR unset WWIPMI_IPADDR
unset WWIPMI_NETMASK unset WWIPMI_NETMASK
unset WWIPMI_GATEWAY unset WWIPMI_GATEWAY
unset WWIPMI_USER unset WWIPMI_USER
unset WWIPMI_PASSWORD unset WWIPMI_PASSWORD
echo "Calling {{$.Init}}..." echo "Calling $WWINIT..."
echo echo
sleep 2 sleep 2
exec {{$.Init}} exec $WWINIT