summaryrefslogtreecommitdiffstats
path: root/installer
diff options
context:
space:
mode:
authorLars Müller2006-12-15 23:20:13 +0100
committerLars Müller2006-12-15 23:20:13 +0100
commit4e6c5efb259df8efd6e7ac895ff2c96e0d7981fb (patch)
tree9f1a63e0384f005a60fdeea00c9d4e742a7e75a7 /installer
parentAllow to use a systems directory from the current working directory. By (diff)
downloadcore-4e6c5efb259df8efd6e7ac895ff2c96e0d7981fb.tar.gz
core-4e6c5efb259df8efd6e7ac895ff2c96e0d7981fb.tar.xz
core-4e6c5efb259df8efd6e7ac895ff2c96e0d7981fb.zip
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
Diffstat (limited to 'installer')
-rwxr-xr-xinstaller/slxossetup5
1 files changed, 3 insertions, 2 deletions
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.