Update for new BUILD_DIR and SRC_DIR variables

[hvlinux.git] / stage2 / pkg / dhcp

diff --git a/stage2/pkg/dhcp b/stage2/pkg/dhcp
index beb7ee6..0c78176 100644 (file)
--- a/stage2/pkg/dhcp
+++ b/stage2/pkg/dhcp
@@ -2,11 +2,10 @@
 
 hvconfig_pre()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-    sed -i 's%\(^sbindir =\).*%\1 @prefix@@sbindir@%' server/Makefile.in
+    sed -i 's%\(^sbindir =\).*%\1 @prefix@@sbindir@%' \
+        ${SRC_DIR}/server/Makefile.in
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --localstatedir=/var \
         --sbindir=/sbin \
         --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
@@ -17,38 +16,12 @@ hvconfig_pre()
 
 hvconfig_post()
 {
-    sed -i 's/-Werror//' {client,common,dst,omapip,relay,server,tests}/Makefile
+    sed -i 's/-Werror//' \
+        ${BUILD_DIR}/{client,common,dst,omapip,relay,server,tests}/Makefile
 }
 
 hvbuild_post()
 {
-    install -m 755 client/scripts/linux /sbin/dhclient-script
-
-    # This is for the DHCP client
-    cat > /etc/dhclient.conf << "EOF"
-# dhclient.conf
-
-timeout 15;
-
-interface "eth0"{
-  supersede domain-name "_DOMAIN_";
-  request subnet-mask, broadcast-address, time-offset, routers,
-          domain-name, domain-name-servers, host-name;
-  require subnet-mask, domain-name-servers;
-}
-EOF
-
-    sed -i -e "s!_DOMAIN_!${DOMAIN}!g" /etc/dhclient.conf
-
-    cat > /etc/sysconfig/network/dhcp-client << "EOF"
-# dhcp-client
-# DHCP client program informations
-#
-DHCP_PROG="/sbin/dhclient"
-DHCP_START="-q -1"
-DHCP_STOP="-q -r"
-EOF
-
     # Create a base configuration file for a DHCP server.
     cat > /etc/dhcpd.conf << EOF
 # Configuration file for DHCP server.