diff options
| author | Sebastian Schmelzer | 2011-02-28 22:27:21 +0100 |
|---|---|---|
| committer | Sebastian Schmelzer | 2011-02-28 22:27:21 +0100 |
| commit | a46615b6421cb6d73654618ae0600dc84d3dceac (patch) | |
| tree | cc43a3097c43c7a8332d57fe9443d80a79de9c68 /src | |
| parent | add compcache tools to default rootfs (diff) | |
| parent | Fixing missing quotes bug ... (diff) | |
| download | core-a46615b6421cb6d73654618ae0600dc84d3dceac.tar.gz core-a46615b6421cb6d73654618ae0600dc84d3dceac.tar.xz core-a46615b6421cb6d73654618ae0600dc84d3dceac.zip | |
Merge branch 'stable' of openslx.org:openslx/core into stable
Diffstat (limited to 'src')
4 files changed, 19 insertions, 8 deletions
diff --git a/src/os-plugins/plugins/qemukvm/init-hooks/60-have-servconfig/vm-dhcpd.sh b/src/os-plugins/plugins/qemukvm/init-hooks/60-have-servconfig/vm-dhcpd.sh index b4f02389..8f0aedff 100755 --- a/src/os-plugins/plugins/qemukvm/init-hooks/60-have-servconfig/vm-dhcpd.sh +++ b/src/os-plugins/plugins/qemukvm/init-hooks/60-have-servconfig/vm-dhcpd.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2010 - OpenSLX GmbH +# Copyright (c) 2010,2011 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -18,6 +18,10 @@ CONFDIR=/mnt/${OPENSLX_DEFAULT_CONFDIR} testmkd ${CONFDIR} +# read the DNS configuration +. /mnt/etc/machine-setup +[ -z "${domain_name_servers}" ] && domain_name_servers="8.8.8.8" + # configuring dhcpd stub for virtual networks cat > ${CONFDIR}/udhcpd.conf << EOF # general udhcpd configuration file for virtual machines written by diff --git a/src/os-plugins/plugins/virtualbox/files/run-virt.include b/src/os-plugins/plugins/virtualbox/files/run-virt.include index d05913ad..2efcc779 100644 --- a/src/os-plugins/plugins/virtualbox/files/run-virt.include +++ b/src/os-plugins/plugins/virtualbox/files/run-virt.include @@ -1,7 +1,7 @@ # run-virt.include # ----------------------------------------------------------------------------- -# Copyright (c) 2009..2010 - RZ Uni Freiburg -# Copyright (c) 2009..2010 - OpenSLX GmbH +# Copyright (c) 2009..2011 - RZ Uni Freiburg +# Copyright (c) 2009..2011 - OpenSLX GmbH # # This program/file is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -373,3 +373,5 @@ VIRTCMDOPTS="--startvm ${machineuuid} --start-running" # set headless mode (-v off to disable vrdp) VIRTCMDHL=$(which VBoxHeadless 2>/dev/null) VIRTCMDOPTSHL="-s ${machineuuid}" +RMDIRS="${TMPDIR}" + diff --git a/src/os-plugins/plugins/vmware/files/run-virt.include b/src/os-plugins/plugins/vmware/files/run-virt.include index 2010dc4b..6f1098d5 100644 --- a/src/os-plugins/plugins/vmware/files/run-virt.include +++ b/src/os-plugins/plugins/vmware/files/run-virt.include @@ -1,7 +1,7 @@ # run-virt.include # ----------------------------------------------------------------------------- -# Copyright (c) 2009..2010 - RZ Uni Freiburg -# Copyright (c) 2009..2010 - OpenSLX GmbH +# Copyright (c) 2009..2011 - RZ Uni Freiburg +# Copyright (c) 2009..2011 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -227,9 +227,9 @@ pref.eula.1.buildNumber = \"${vmbuild}\"" >${vmhome}/preferences # VM-ID static (0D), remove if changed to 00 VM_ID="0D" # temporary disk space for logs, etc... -redodir=/tmp/vmware/${USER} +redodir=/var/tmp/vmware/${USER} # dir for configs and vmem file -confdir=${redodir} +confdir=/var/tmp/vmware/${USER} # configfile conffile="${confdir}/run-vmware.conf" # diskfile @@ -446,3 +446,4 @@ writelog "" # using the modified version of the wrapper script VIRTCMD="${OPENSLX_DEFAULT_BINDIR}/vmplayer" VIRTCMDOPTS="${vmopt} ${conffile}" +RMDIRS="${redodir} ${conffile}" diff --git a/src/os-plugins/plugins/vmware/init-hooks/60-have-servconfig/vm-dhcpd.sh b/src/os-plugins/plugins/vmware/init-hooks/60-have-servconfig/vm-dhcpd.sh index b4f02389..8f0aedff 100755 --- a/src/os-plugins/plugins/vmware/init-hooks/60-have-servconfig/vm-dhcpd.sh +++ b/src/os-plugins/plugins/vmware/init-hooks/60-have-servconfig/vm-dhcpd.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2010 - OpenSLX GmbH +# Copyright (c) 2010,2011 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -18,6 +18,10 @@ CONFDIR=/mnt/${OPENSLX_DEFAULT_CONFDIR} testmkd ${CONFDIR} +# read the DNS configuration +. /mnt/etc/machine-setup +[ -z "${domain_name_servers}" ] && domain_name_servers="8.8.8.8" + # configuring dhcpd stub for virtual networks cat > ${CONFDIR}/udhcpd.conf << EOF # general udhcpd configuration file for virtual machines written by |