From 096cb7ab9331abfa0cba7c1358ce52e06fc295b8 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Mon, 28 Feb 2011 21:59:25 +0100
Subject: Fix the udhcpd.conf generation ...

---
 .../plugins/qemukvm/init-hooks/60-have-servconfig/vm-dhcpd.sh       | 6 +++++-
 .../plugins/vmware/init-hooks/60-have-servconfig/vm-dhcpd.sh        | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'src')

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
-- 
cgit v1.2.3-55-g7522