From 86c36ec677595bc42025c060598f19186f249fa0 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Mon, 25 Jan 2010 13:19:05 +0000
Subject: [PATCH] =?UTF-8?q?cfg=20file=20format=20wurde=20ge=C3=A4ndert=20u?=
 =?UTF-8?q?nd=20basiert=20jetzt=20auf=20dem=20shortname..?=
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@5205 504e572c-2e33-0410-9681-be2bf7408885
---
 .function         | 5 +++--
 make_base_install | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.function b/.function
index a6d9c5d..eca4383 100755
--- a/.function
+++ b/.function
@@ -342,10 +342,11 @@ install_cluster() {
 	if [ ! -z ${NO_MAN} ]; then
 		INSTOPT="${INSTOPT} -a"
 	fi
-	while read -r <&3 INSTCD INSTPKG; do
+	while read -r <&3 INSTCD PKGPATH SHNAME; do
 		echo -n "$NUMOFPKG: "
+		INSTPKG=`egrep "SN=$SHNAME;.*PP=$PKGPATH\$" $INSTSOURCE/$PKGLIST|awk -F";" '{print $2}'|sed -e "s/PF=//"`
 		if [ "$INSTCD" == "Boot" ]; then
-			installpkg ${INSTOPT} -m $INSTALLROOT -doi $INSTSOURCE/$INSTPKG
+			installpkg ${INSTOPT} -m $INSTALLROOT -doi $INSTSOURCE/$PKGPATH/$INSTPKG
 		else
 			echo "$INSTCD $INSTPKG" >>$INSTALLROOT/var/install/pkg_to_do
 		fi
diff --git a/make_base_install b/make_base_install
index 8b76bce..76445b8 100644
--- a/make_base_install
+++ b/make_base_install
@@ -44,6 +44,8 @@ INSTALLDIR=/mnt
 CURRDIR=`pwd`
 cd ..
 SOURCE=`pwd`
+export PKGLIST=.pkglist
+BINPATH=BINARY
 
 if [ -z "$INSTALLDIR" ]; then
 	echo "USAGE: $0 [-c cfgfile][-m InstallRoot]"
@@ -108,6 +110,6 @@ fi
 if [ ! -d $INSTALLDIR/var/install/contents ]; then
 	touch $INSTALLDIR/var/install/contents
 fi
-install_cluster $CFGFILE $INSTALLDIR $SOURCE
+install_cluster $CFGFILE $INSTALLDIR $SOURCE/$BINPATH
 install_kernel $INSTALLDIR
 make_boot $INSTALLDIR