From e437b8813f2a84ccffa3a75ba1f534b38ce72b9c Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Tue, 6 Apr 2010 20:01:24 +0200
Subject: cumulative commit of local branch, many changes regarding
 virtualization

---
 .../init-hooks/60-have-servconfig/vm-dhcpd.sh        | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'os-plugins/plugins/qemukvm/init-hooks/60-have-servconfig/vm-dhcpd.sh')

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 153cac68..396631c1 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
@@ -13,9 +13,13 @@
 # (should be kept identical to the files of virtualbox and vmware 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
 
@@ -30,15 +34,15 @@ interface	NWIF
 offer_time	6000
 
 # location of the leases file
-lease_file	LEASEDIR/udhcpd.leases
+lease_file	LEASEFILE
 
 # location of the pid file
-pidfile		PIDFILE/udhcpd.pid
+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.254
+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