diff options
| author | Lars Müller | 2007-01-09 13:16:38 +0100 |
|---|---|---|
| committer | Lars Müller | 2007-01-09 13:16:38 +0100 |
| commit | 461f6d8e6287320b029117ea3378ee497e4849c2 (patch) | |
| tree | 291f8f63094d4dc1bbd395b903809fc759580f94 /installer | |
| parent | x86_64 architecture integration should be started ... (diff) | |
| download | core-461f6d8e6287320b029117ea3378ee497e4849c2.tar.gz core-461f6d8e6287320b029117ea3378ee497e4849c2.tar.xz core-461f6d8e6287320b029117ea3378ee497e4849c2.zip | |
Do not call rpm ... *.rpm. Intead collect the list of package from the
download dir. Then call rpm with this package list.
This fixes the problem seen by Dirk as soon as the dir from where
slxossetup was called contained one or more files ending with *.rpm.
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@605 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
| -rwxr-xr-x | installer/slxossetup | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/installer/slxossetup b/installer/slxossetup index 829ef491..d4c3d372 100755 --- a/installer/slxossetup +++ b/installer/slxossetup @@ -187,7 +187,7 @@ function setup_bootstrap_1b() function setup_bootstrap_1c() { - local dir file packagekey + local dir file packagelist packagekey case "${SLX_SYSTEM_BASENAME}" in *ubuntu*) @@ -216,8 +216,11 @@ function setup_bootstrap_1c() chroot "${CHROOT_DIR}/${SLX_BOOTSTRAP_PATH}" \ /bin/rpm --root="${SLX_STAGE1_FINAL_PATH}" --import "${packagekey}" done + cd "${CHROOT_DIR}/${SLX_BOOTSTRAP_PATH}" + packagelist=$( ls *.rpm) + cd - >/dev/null chroot "${CHROOT_DIR}/${SLX_BOOTSTRAP_PATH}" \ - /bin/rpm --root="${SLX_STAGE1_FINAL_PATH}" -ivh *.rpm + /bin/rpm --root="${SLX_STAGE1_FINAL_PATH}" -ivh ${packagelist} cp -p /etc/resolv.conf "${CHROOT_DIR}/${SLX_BOOTSTRAP_PATH}/${SLX_STAGE1_FINAL_PATH}/etc/" ;; esac @@ -338,7 +341,7 @@ function install_slxselection() exit 1 fi - local packagelist variable + local packages packagelist variable for variable in ${!SLX_INSTALL_PACKAGES_*}; do packages=$( eval echo \$$variable) packagelist="${packagelist:+$packagelist }$( eval echo \$$variable)" |