From 4e6c5efb259df8efd6e7ac895ff2c96e0d7981fb Mon Sep 17 00:00:00 2001
From: Lars Müller
Date: Fri, 15 Dec 2006 22:20:13 +0000
Subject: Only unpack the packages we have in SLX_BASE_PREREQ_PACKAGES.  Here
 is still the race if we have package foo in the list of required packages but
 hhave foo-1.2.3...rpm and foo-devel-1.2.3...rpm in smarts packages directory.

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@547 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 installer/slxossetup | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'installer')

diff --git a/installer/slxossetup b/installer/slxossetup
index d71b3743..a330ab6f 100755
--- a/installer/slxossetup
+++ b/installer/slxossetup
@@ -99,8 +99,9 @@ function slxossetup_rpm_suse()
 	test -d "${SLX_STAGE1_PATH}" || \
 		mkdir -p "${SLX_STAGE1_PATH}"
 	pushd "${SLX_STAGE1_PATH}" >/dev/null
-	for package in "${SLX_PACKAGE_PATH}/*.rpm"; do
-		rpm2cpio ${package} | cpio -i --make-directories
+	for package in $SLX_BASE_PREREQ_PACKAGES; do
+		rpm2cpio ${SLX_PACKAGE_PATH}/${package}-*.rpm | \
+			cpio -i --make-directories
 	done
 	# Cleanup etc to prevent .rpnnew files
    # FIXME: This should be controled by the config file.
-- 
cgit v1.2.3-55-g7522