diff options
| author | Michael Janczyk | 2010-05-17 22:21:57 +0200 |
|---|---|---|
| committer | Michael Janczyk | 2010-05-17 22:21:57 +0200 |
| commit | db7bc082ea77bd2417a591a1ad9609e3452e28c3 (patch) | |
| tree | dc8f2e8a7da823931c32a2c6443a53a2f2b1377d /os-plugins/plugins | |
| parent | minor naming changes (diff) | |
| download | core-db7bc082ea77bd2417a591a1ad9609e3452e28c3.tar.gz core-db7bc082ea77bd2417a591a1ad9609e3452e28c3.tar.xz core-db7bc082ea77bd2417a591a1ad9609e3452e28c3.zip | |
router address changed to x.x.x.1, works /w vmware
Diffstat (limited to 'os-plugins/plugins')
3 files changed, 14 insertions, 10 deletions
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/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 |