From 8e1ae4960252cd196f24500f838cc6e533c7b7c8 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Mon, 8 Apr 2013 11:02:46 +0000
Subject: [PATCH] integrate-distro.sh: Ongoing improvements

  - Fix mode of /root/.ssh/config
  - Run jcs setup earlier
  - Move RUN_PARALLEL, DHCPD_INTERFACE and DHCPD_CONF_INCLUDE_FILES into jcs

Signed-off-by: Jan Lindemann <jan@jannet.de>
---
 scripts/integrate-distro.sh | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh
index 5f3ad923..4a9f7388 100644
--- a/scripts/integrate-distro.sh
+++ b/scripts/integrate-distro.sh
@@ -858,10 +858,12 @@ insserv_all()
 		boot.juxearly
 		boot.bprof
 		sshd
+		ldap
 		jux
 	"
 	services="
 		sshd
+		ldap
 	"
 
 	case $suse_version in
@@ -958,7 +960,7 @@ cmd_install()
 
 	mkdir -p -m 700 $root/root/.ssh
 	make_home_ssh_conf > $root/root/.ssh/config
-	chmod 600 $root/.ssh/config
+	chmod 600 $root/root/.ssh/config
 
 	[ "$copy_source_dir" ] && {
 		echo "=== copying over dir $copy_source_dir"
@@ -968,6 +970,14 @@ cmd_install()
 		chroot $root /opt/ytools/bin/jcs init # TODO: remove this
 	}
 
+	echo "=== running jcs setup"
+	export CVSROOT=:ext:$scm_user@cvs.jannet.de:/home/jannet/arc/cvs
+	if [ "$SSH_AUTH_SOCK" ]; then
+		mkdir -m 700 -p `dirname $root/$SSH_AUTH_SOCK`
+		ln $SSH_AUTH_SOCK $root/$SSH_AUTH_SOCK
+	fi
+	chroot $root jcs setup
+
 	# seed the ldap database
 	# FIXME: this does not work off a netboot distro
 	slapcat | chroot $root /usr/sbin/slapadd -qw
@@ -978,24 +988,18 @@ cmd_install()
 
 	insserv_all
 
-	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"
-
 	echo "=== using root password file $root_password_file"
+	echo -n root: | cat - $root_password_file | chroot $root /usr/sbin/chpasswd
+
 	case $suse_version in
 	11.4)
-		cat $root_password_file | chroot $root /usr/bin/passwd --stdin
+		chroot $root /sbin/SuSEconfig
 		;;
 	*)
-		echo -n root: | cat - $root_password_file | chroot $root /usr/sbin/chpasswd
 		;;
 	esac
-
-	chroot $root /sbin/ldconfig
-	chroot $root /sbin/SuSEconfig
 	chroot $root /opt/jux/bin/jux-init-namespace.sh
+	chroot $root /sbin/ldconfig
 	install -m 755 -d $root/srv/nfs/boot/pxe/bin
 	install -m 755 -d $root/srv/nfs/var
 	install -m 777 -d $root/srv/nfs/var/cores
@@ -1004,13 +1008,6 @@ cmd_install()
 	chroot $root /usr/sbin/pam-config -c
 	chroot $root /usr/sbin/pam-config -a --ldap
 
-	echo "=== running jcs setup"
-	export CVSROOT=:ext:$scm_user@cvs.jannet.de:/home/jannet/arc/cvs
-	if [ "$SSH_AUTH_SOCK" ]; then
-		mkdir -m 700 -p `dirname $root/$SSH_AUTH_SOCK`
-		ln $SSH_AUTH_SOCK $root/$SSH_AUTH_SOCK
-	fi
-	chroot $root jcs setup
 	rm -f $root/$SSH_AUTH_SOCK
 
 	unmount_devices