diff options
| author | Michael Janczyk | 2010-06-04 15:03:10 +0200 |
|---|---|---|
| committer | Michael Janczyk | 2010-06-04 15:03:10 +0200 |
| commit | ffbf58a3401a314cd38ef99d0d16602046fb6810 (patch) | |
| tree | 6b1043c30b5d16b1f328fd44dd342bb103efbe95 /os-plugins/plugins/vmchooser | |
| parent | fixes apt, ../archives/partial directry required (diff) | |
| download | core-ffbf58a3401a314cd38ef99d0d16602046fb6810.tar.gz core-ffbf58a3401a314cd38ef99d0d16602046fb6810.tar.xz core-ffbf58a3401a314cd38ef99d0d16602046fb6810.zip | |
nice level, more host infos in virtualization.conf, copy to share dir in vmgrid
Diffstat (limited to 'os-plugins/plugins/vmchooser')
| -rw-r--r-- | os-plugins/plugins/vmchooser/files/run-virt.sh | 2 | ||||
| -rw-r--r-- | os-plugins/plugins/vmchooser/init-hooks/80-after-plugins/virtualization.sh | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/os-plugins/plugins/vmchooser/files/run-virt.sh b/os-plugins/plugins/vmchooser/files/run-virt.sh index 771ebef4..df2a7404 100644 --- a/os-plugins/plugins/vmchooser/files/run-virt.sh +++ b/os-plugins/plugins/vmchooser/files/run-virt.sh @@ -132,7 +132,7 @@ mem=$(expr ${totalmem} / 100 \* ${permem} / 4 \* 4) # last two bytes are taken from the bridge of the host # define one MAC per guest macguestpart="00:50:56:${VM_ID}" -machostpart=$(echo ${machostaddr} | awk -F ":" '{print $(NF-1)":"$NF}') +machostpart=$(echo ${hostmacaddr} | awk -F ":" '{print $(NF-1)":"$NF}') macaddr=$(echo "${macguestpart}:${machostpart}" | tr [a-z] [A-Z]) #TODO: remove when vmware modified mac=${machostpart} diff --git a/os-plugins/plugins/vmchooser/init-hooks/80-after-plugins/virtualization.sh b/os-plugins/plugins/vmchooser/init-hooks/80-after-plugins/virtualization.sh index 37576331..23095abf 100644 --- a/os-plugins/plugins/vmchooser/init-hooks/80-after-plugins/virtualization.sh +++ b/os-plugins/plugins/vmchooser/init-hooks/80-after-plugins/virtualization.sh @@ -109,7 +109,11 @@ EOF fi # write mac - echo "machostaddr=${macaddr}" >> ${PLUGINCONFDIR}/virtualization.conf + echo "hostmacaddr=${macaddr}" >> ${PLUGINCONFDIR}/virtualization.conf + # ip addr + echo "hostip=${clientip}" >> ${PLUGINCONFDIR}/virtualization.conf + # hostname + echo "hostname=${host_name}" >> ${PLUGINCONFDIR}/virtualization.conf # get further hw information waitfor /etc/hwinfo.cdrom @@ -126,6 +130,11 @@ EOF j=$(expr $j + 1) done + # copy host information to rwshare of vmgrid plugin + if [ "x${vmgrid_active}" = "x1" ]; then + cp ${PLUGINCONFDIR}/virtualization.conf ${vmgrid_rwmnt}/host.conf + fi + # finished ... [ $DEBUGLEVEL -gt 0 ] \ && echo "ok" |