From 9b0da21b0e5f5ad7bb02a70ecdd73dbfb989688b Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Fri, 24 Jun 2011 09:45:50 +0000
Subject: [PATCH] integrate-distro.sh: Ongoing improvements

  - Add package xterm
  - Add additional check to prevent accidental deletion of bind-mounts
  - Add preliminary configuration of eth0
---
 scripts/integrate-distro.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh
index 031102a3..9f261d09 100644
--- a/scripts/integrate-distro.sh
+++ b/scripts/integrate-distro.sh
@@ -96,6 +96,8 @@ payload_pkgs="
 	xorg-x11-Xvfb
 	xorg-x11-Xvnc
 
+	xterm
+
 	man
 	findutils-locate
 	vim
@@ -627,6 +629,13 @@ setup_root_directory()
 
 		set +e
 		unmount_devices /proc /sys /dev
+		grep -q $root /proc/mounts && {
+			echo "====== there are filesystems mounted below $root: >"
+			grep $root /proc/mounts
+			echo "====== unmount them manually"
+			exit 1
+		}
+
 		run rm -rf $root
 		run install -d -m 755 $root
 	fi
@@ -693,6 +702,7 @@ cmd_install()
 	make_netboot_etc_ldap_conf > $root/etc/ldap.conf.netboot
 	make_netboot_etc_openldap_ldap_conf > $root/etc/openldap/ldap.conf.netboot
 	make_netboot_etc_hosts > $root/etc/hosts.netboot
+	echo "STARTMODE='nfsroot'" > $root/etc/sysconfig/network/ifcfg-eth0.netboot
 
 	make_etc_openldap_ldap_conf > $root/etc/openldap/ldap.conf
 	chmod 644 $root/etc/openldap/ldap.conf