From d396ef5108ac7bc8367fab4dc156c5bdf020c5fe Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Wed, 22 Jun 2011 06:53:07 +0000
Subject: [PATCH] integrate-distro.sh: Ongoing improvements

  - Add tftp rsync cpio
  - Setting DHCPD_CONF_INCLUDE_FILES in /etc/sysconfig/dhcpd
---
 scripts/integrate-distro.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh
index d02ba1c1..32df77f5 100644
--- a/scripts/integrate-distro.sh
+++ b/scripts/integrate-distro.sh
@@ -54,6 +54,7 @@ payload_pkgs="
 	xinetd
 	apache2
 	nfs-kernel-server
+	tftp
 
 	unscd
 	nss_ldap
@@ -101,6 +102,7 @@ payload_pkgs="
 	openssh
 
 	tar zip unzip
+	rsync cpio
 
 	gcc-c++ libtool autoconf automake make
 	cvs
@@ -695,6 +697,8 @@ cmd_install()
 
 	set_sysconf_value etc/sysconfig/boot RUN_PARALLEL no
 	set_sysconf_value etc/sysconfig/dhcpd DHCPD_INTERFACE eth0 # TODO: bprof this
+	set_sysconf_value etc/sysconfig/dhcpd DHCPD_CONF_INCLUDE_FILES \
+		"/etc/hosts /etc/ldap.conf /etc/openldap/ldap.conf /etc/certs /etc/nsswitch.conf /etc/dhcpd.conf.d"
 
 	cat $root_password_file | chroot $root /usr/bin/passwd --stdin
 	chroot $root /sbin/ldconfig