From 716fb67d6e4b105b77d6ea0a51aedd986415de48 Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Mon, 17 May 2010 22:24:43 +0200
Subject: changer router addres to x.x.x.1 since vmware seems to need that.
 virtualbox changes, /wo vt flags only one vcpu possible

---
 .../qemukvm/init-hooks/60-have-servconfig/vm-dhcpd.sh  |  4 ++--
 os-plugins/plugins/virtualbox/files/machine.include    |  4 ++--
 os-plugins/plugins/virtualbox/files/run-virt.include   | 16 ++++++++++++----
 os-plugins/plugins/vmware/files/run-virt.include       |  2 +-
 .../vmware/init-hooks/60-have-servconfig/vm-dhcpd.sh   | 18 +++++++++++-------
 5 files changed, 28 insertions(+), 16 deletions(-)

(limited to 'os-plugins')

diff --git a/os-plugins/plugins/qemukvm/init-hooks/60-have-servconfig/vm-dhcpd.sh b/os-plugins/plugins/qemukvm/init-hooks/60-have-servconfig/vm-dhcpd.sh
index 396631c1..4d10965d 100755
--- a/os-plugins/plugins/qemukvm/init-hooks/60-have-servconfig/vm-dhcpd.sh
+++ b/os-plugins/plugins/qemukvm/init-hooks/60-have-servconfig/vm-dhcpd.sh
@@ -10,7 +10,7 @@
 # General information about OpenSLX can be found at http://openslx.org
 #
 # Init hook to create a bridge on the active network interface
-# (should be kept identical to the files of virtualbox and vmware plugins)
+# (should be kept identical in vmware, virtualbox and qemukvm plugins)
 #############################################################################
 
 . /etc/openslx.conf
@@ -41,7 +41,7 @@ pidfile		PIDFILE
 
 option	dns	${domain_name_servers}
 option	subnet	255.255.255.0
-option	router	CNETWORK.254
+option	router	CNETWORK.1
 option	wins	CNETWORK.10
 option	domain	virtual.site ${domain_name}
 
diff --git a/os-plugins/plugins/virtualbox/files/machine.include b/os-plugins/plugins/virtualbox/files/machine.include
index 1544d4d6..8d1e23c4 100644
--- a/os-plugins/plugins/virtualbox/files/machine.include
+++ b/os-plugins/plugins/virtualbox/files/machine.include
@@ -15,8 +15,8 @@ cat << EOF > "${machconfig}"
     </ExtraData>
     <Hardware version="2">
       <CPU count="${cpu_cores}">
-        <HardwareVirtEx enabled="true" exclusive="true"/>
-        <HardwareVirtExNestedPaging enabled="false"/>
+        <HardwareVirtEx enabled="${enablevt}" exclusive="true"/>
+        <HardwareVirtExNestedPaging enabled="${npaging}"/>
         <HardwareVirtExVPID enabled="false"/>
         <PAE enabled="true"/>
       </CPU>
diff --git a/os-plugins/plugins/virtualbox/files/run-virt.include b/os-plugins/plugins/virtualbox/files/run-virt.include
index 4a1e2c14..a4ebe222 100644
--- a/os-plugins/plugins/virtualbox/files/run-virt.include
+++ b/os-plugins/plugins/virtualbox/files/run-virt.include
@@ -94,10 +94,6 @@ case "${vmostype}" in
         writelog "This is not supported, exiting!"
         cleanexit 1
       fi
-      # check if host is only 32 bit, then use only 1 cpu (only 1 supported)
-      if echo "${host_arch}" | grep -qE "i.86"; then
-        cpu_cores=1
-      fi
     else
       vmostype="Linux26"
     fi
@@ -244,6 +240,10 @@ case ${boot} in
         writelog "Network boot won't work, exiting!"
         cleanexit 1
       fi
+      # check if host is only 32 bit, then use only 1 cpu (only 1 supported)
+      if echo "${host_arch}" | grep -qE "i.86"; then
+        cpu_cores=1
+      fi
       for i in $(ls ${virtualbox_tftpdir}); do
         ln -sf ${virtualbox_tftpdir}/${i} ${confdir}/TFTP/${i}
       done
@@ -255,6 +255,14 @@ case ${boot} in
   ;;
 esac
 
+# nested paging
+npaging="false"
+# enable VT
+enablevt="false"
+# check for VT, if not available use only 1 cpu (only 1 supported)
+[ ${vtflag} -eq 0 ] && cpu_cores=1
+[ ${vtflag} -eq 1 ] && enablevt="true"
+
 # external GUI
 vrdpport=${remotedesktopport}
 
diff --git a/os-plugins/plugins/vmware/files/run-virt.include b/os-plugins/plugins/vmware/files/run-virt.include
index 8b91275a..2c501156 100644
--- a/os-plugins/plugins/vmware/files/run-virt.include
+++ b/os-plugins/plugins/vmware/files/run-virt.include
@@ -61,7 +61,7 @@ case "$vmversion" in
 cpuid.coresPerSocket = \"${cpu_cores}\"
 maxvcpus = \"4\"
 # svga.numDisplays = "2"
-# svgy.maxWidth = "2560"
+# svga.maxWidth = "2560"
 # svga.maxHeight = "2048"
 # svga.vramSize = "134217728"
 monitor.virtual_mmu = \"automatic\"
diff --git a/os-plugins/plugins/vmware/init-hooks/60-have-servconfig/vm-dhcpd.sh b/os-plugins/plugins/vmware/init-hooks/60-have-servconfig/vm-dhcpd.sh
index 6bdfb8f1..4d10965d 100755
--- a/os-plugins/plugins/vmware/init-hooks/60-have-servconfig/vm-dhcpd.sh
+++ b/os-plugins/plugins/vmware/init-hooks/60-have-servconfig/vm-dhcpd.sh
@@ -10,12 +10,16 @@
 # General information about OpenSLX can be found at http://openslx.org
 #
 # Init hook to create a bridge on the active network interface
-# (should be kept identical to the files of virtualbox and qemukvm plugins)
+# (should be kept identical in vmware, virtualbox and qemukvm plugins)
 #############################################################################
 
+. /etc/openslx.conf
+
+CONFDIR=/mnt/${OPENSLX_DEFAULT_CONFDIR}
+testmkd ${CONFDIR}
+
 # configuring dhcpd stub for virtual networks
-testmkd /mnt/etc/opt/openslx
-echo "
+cat > ${CONFDIR}/udhcpd.conf << EOF
 # general udhcpd configuration file for virtual machines written by
 # $0 during OpenSLX stage3 configuration
 
@@ -35,10 +39,10 @@ lease_file	LEASEFILE
 # location of the pid file
 pidfile		PIDFILE
 
-opt	dns	${domain_name_servers}
+option	dns	${domain_name_servers}
 option	subnet	255.255.255.0
-opt	router	CNETWORK.254
-opt	wins	CNETWORK.10
+option	router	CNETWORK.1
+option	wins	CNETWORK.10
 option	domain	virtual.site ${domain_name}
 
 # additional options known to udhcpd
@@ -53,4 +57,4 @@ option	domain	virtual.site ${domain_name}
 #wins			#lease
 #ntpsrv			#tftp
 #bootfile
-" >/mnt/etc/opt/openslx/udhcpd.conf
+EOF
-- 
cgit v1.2.3-55-g7522