From 38263c28c06e0d64f561a6337cadd53c607d8123 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Wed, 22 Apr 2009 18:04:11 +0000
Subject: [PATCH] =?UTF-8?q?Funktionalit=C3=A4t=20so=20erweitert,=20so=20da?=
 =?UTF-8?q?ss=20beim=20installieren=20eines=20config=20clusters,=20die=20a?=
 =?UTF-8?q?nzahl=20der=20noch=20zu=20installierenden=20files=20mit=20der?=
 =?UTF-8?q?=20installation=20meldung=20ausgegeben=20wird.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorInstall@4614 504e572c-2e33-0410-9681-be2bf7408885
---
 .function         | 5 ++++-
 make_base_install | 9 ++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.function b/.function
index 2c057f6..a6d9c5d 100755
--- a/.function
+++ b/.function
@@ -334,6 +334,7 @@ install_cluster() {
 	INSTSOURCE=$3
 
 	sed -e "/^#/d" -e "/^ *$/d" $CFGFILE >/tmp/install$$
+	NUMOFPKG=`cat /tmp/install$$|wc -l`
 	exec 3</tmp/install$$
 	if [ ! -z ${NO_DEV} ]; then
 		INSTOPT="${INSTOPT} -e"
@@ -342,11 +343,13 @@ install_cluster() {
 		INSTOPT="${INSTOPT} -a"
 	fi
 	while read -r <&3 INSTCD INSTPKG; do
+		echo -n "$NUMOFPKG: "
 		if [ "$INSTCD" == "Boot" ]; then
-			installpkg ${INSTOPT} -m $INSTALLROOT -di $INSTSOURCE/$INSTPKG
+			installpkg ${INSTOPT} -m $INSTALLROOT -doi $INSTSOURCE/$INSTPKG
 		else
 			echo "$INSTCD $INSTPKG" >>$INSTALLROOT/var/install/pkg_to_do
 		fi
+		(( NUMOFPKG-- ))
 	done 
 	if [ -f $INSTALLROOT/root/.bash_profile ]; then
 		cp $INSTALLROOT/root/.bash_profile $INSTALLROOT/root/.bash_profile.store
diff --git a/make_base_install b/make_base_install
index 6fc130e..8b76bce 100644
--- a/make_base_install
+++ b/make_base_install
@@ -100,11 +100,14 @@ install/.basedirs $INSTALLDIR
 cd $INSTALLDIR
 if [ ! -d $INSTALLDIR/var/install ]; then
 	print "Create install info Directory"
-	mkdir -p $INSTALLDIR/var/install
-	chown root:root $INSTALLDIR/var/install
-	chmod 750 $INSTALLDIR/var/install
+	mkdir -p $INSTALLDIR/var/install &&
+	chown root:root $INSTALLDIR/var/install &&
+	chmod 750 $INSTALLDIR/var/install 
 	print_status success
 fi
+if [ ! -d $INSTALLDIR/var/install/contents ]; then
+	touch $INSTALLDIR/var/install/contents
+fi
 install_cluster $CFGFILE $INSTALLDIR $SOURCE
 install_kernel $INSTALLDIR
 make_boot $INSTALLDIR