diff options
| author | Lars Müller | 2006-12-18 13:57:27 +0100 |
|---|---|---|
| committer | Lars Müller | 2006-12-18 13:57:27 +0100 |
| commit | 38c5685373099d4a3158ad6d519ac80899a24464 (patch) | |
| tree | fdd4c142da4e59adff98a327c0fb4b5db4984784 /installer | |
| parent | Add support to save more than downloaded prerequired RPM files. (diff) | |
| download | core-38c5685373099d4a3158ad6d519ac80899a24464.tar.gz core-38c5685373099d4a3158ad6d519ac80899a24464.tar.xz core-38c5685373099d4a3158ad6d519ac80899a24464.zip | |
Collecting the list of packages after the download allows us to install
more than one prerequired package.
Only change to the SLX_STAGE1_PATH directory if the packaging tool
requires it.
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@571 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
| -rwxr-xr-x | installer/slxossetup | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/installer/slxossetup b/installer/slxossetup index c1a22ac7..d7551bf1 100755 --- a/installer/slxossetup +++ b/installer/slxossetup @@ -85,19 +85,26 @@ function install_prereq_packages() smart --data-dir="${SLX_METADATA_PATH}" \ download \ ${SLX_BASE_PREREQ_PACKAGES} + + unset packagelist + for package in ${SLX_BASE_PREREQ_PACKAGES}; do + packagelist="${packagelist} $( ls ${package}*)" + done popd >/dev/null test -d "${SLX_STAGE1_PATH}" || \ mkdir -p "${SLX_STAGE1_PATH}" - pushd "${SLX_STAGE1_PATH}" >/dev/null - for package in ${SLX_PACKAGE_DOWNLOAD_PATH}/${SLX_BASE_PREREQ_PACKAGES}*; do + for package in ${packagelist}; do + package="${SLX_PACKAGE_DOWNLOAD_PATH}/${package}" case "${package}" in *.deb) dpkg --root="${SLX_STAGE1_PATH}" --unpack "${package}" ;; *.rpm) + pushd "${SLX_STAGE1_PATH}" >/dev/null rpm2cpio "${package}" | \ cpio -i --make-directories + popd >/dev/null ;; *) echo "$0: Warning, unknown package type of ${package}. " @@ -126,7 +133,6 @@ function install_prereq_packages() xargs -0 rm -f done fi - popd >/dev/null } function slxossetup_smart() |