summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xsrc/os-plugins/plugins/qemukvm/init-hooks/60-have-servconfig/vm-dhcpd.sh6
-rwxr-xr-xsrc/os-plugins/plugins/vmware/init-hooks/60-have-servconfig/vm-dhcpd.sh6
2 files changed, 10 insertions, 2 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..06aa8700 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/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..06aa8700 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