From a14a6e444c47c53417bab649aa0725e85f380811 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Tue, 21 Jun 2011 13:04:06 +0000
Subject: [PATCH] integrate-distro.sh: Ongoing improvements

- Set DHCPD_INTERFACE to etc in /etc/sysconfig/dhcpd
- Add packages ftp-server-run, openvpn, nfs-kernel-server
---
 scripts/integrate-distro.sh | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh
index a4b739bc..97f548ef 100644
--- a/scripts/integrate-distro.sh
+++ b/scripts/integrate-distro.sh
@@ -52,6 +52,7 @@ payload_pkgs="
 	courier-authlib-ldap
 	xinetd
 	apache2
+	nfs-kernel-server
 
 	unscd
 	nss_ldap
@@ -68,6 +69,7 @@ payload_pkgs="
 	sudo
 	sysconfig
 	glibc-locale
+	openvpn
 
 	xorg-x11
 	xorg-x11-driver-video
@@ -109,6 +111,7 @@ payload_pkgs="
 	jux-client-run
 	feedfsd-run
 	snmp-manager-run
+	ftp-server-run
 	bprof-run
 "
 # -- functions
@@ -615,6 +618,15 @@ insserv_all()
 	done
 }
 
+set_sysconf_value()
+{
+	local file="$1"
+	local key="$2"
+	local value="$3"
+	sed "s/^ *$key *=.*/$key=$value/" $root/$file > $root/$file.tmp
+	mv $root/$file.tmp $root/$file
+}
+
 cmd_install()
 {
 	if true; then
@@ -636,6 +648,7 @@ cmd_install()
 		/etc/sysconfig/keyboard \
 		/etc/sysconfig/clock \
 		/etc/openldap/schema/authldap.schema \
+		/etc/bprof.secret \
 	; do
 		install -d -m 755 `dirname $root$c`
 		cp -rp $c $root$c
@@ -672,9 +685,8 @@ cmd_install()
 
 	insserv_all
 
-	local boot_conf=$root/etc/sysconfig/boot
-	sed 's/RUN_PARALLEL *=.*/RUN_PARALLEL=no/' $boot_conf > $boot_conf.tmp
-	mv $boot_conf.tmp $boot_conf
+	set_sysconf_value etc/sysconfig/boot RUN_PARALLEL no
+	set_sysconf_value etc/sysconfig/dhcpd DHCPD_INTERFACE eth0 # TODO: bprof this
 
 	cat $root_password_file | chroot $root /usr/bin/passwd --stdin
 	chroot $root /sbin/ldconfig