diff options
| author | Lars Müller | 2007-01-10 22:22:23 +0100 |
|---|---|---|
| committer | Lars Müller | 2007-01-10 22:22:23 +0100 |
| commit | 9bdedb24f374a403b83329ed1e473f1c096f4cca (patch) | |
| tree | 0b1bfc112ca00f5eaec0d62fcc6c5a2371008a9b /installer/slxossetup | |
| parent | auto detect name of cdrom and floppy. /dev/cdrom does not work on our (diff) | |
| download | core-9bdedb24f374a403b83329ed1e473f1c096f4cca.tar.gz core-9bdedb24f374a403b83329ed1e473f1c096f4cca.tar.xz core-9bdedb24f374a403b83329ed1e473f1c096f4cca.zip | |
Revert most of the changes made with rev 607.
There are to may extra tweaks required if we'd like to guess the correct
full path name.
Therefore we'll use instead per system one separat file for any
supported architecture per.
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@612 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer/slxossetup')
| -rwxr-xr-x | installer/slxossetup | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/installer/slxossetup b/installer/slxossetup index d9b20668..6c842244 100755 --- a/installer/slxossetup +++ b/installer/slxossetup @@ -154,9 +154,8 @@ function setup_busybox_stage1_config() SLX_INST_SOURCE_BASEURL \ SLX_INST_SOURCE_DISTRIBUTION \ SLX_INST_SOURCE_PACKAGEKEYS \ - SLX_INST_SOURCE_PACKAGE_ARCHDIR \ SLX_INST_SOURCE_PACKAGE_SUBDIR \ - SLX_KERNEL_ARCH; do + ; do value=$( eval echo \$$key) test "${value}" || \ continue @@ -225,13 +224,6 @@ function setup_bootstrap_1c() /bin/rpm --root="${SLX_STAGE1_FINAL_PATH}" --import "${packagekey}" done for file in ${SLX_BASE_PREREQ_PACKAGES} ${SLX_BASE_BOOTSTRAP_PACKAGES}; do - if test "${file##*.}" = 'noarch'; then - file="${file}.rpm" - elif test "${file##*.}" = 'SLX_KERNEL_ARCH'; then - file="${file%SLX_KERNEL_ARCH}${SLX_KERNEL_ARCH}.rpm" - else - file="${file}.${SLX_INST_ARCH}.rpm" - fi test "${SLX_BOOTSTRAP_FAIL_WGET}" = "no" -a \ ! -f ${CHROOT_DIR}/${SLX_BOOTSTRAP_PATH}/${file##*/} && \ continue @@ -643,15 +635,11 @@ function slxossetup() GLOBAL_SETTINGS="BASEURL PACKAGEKEYS" REPO_TYPE="rpm-md" NAME_DEST_ROOT="rpm-root" - SLX_INST_SOURCE_PACKAGE_ARCHDIR="yes" - X86_ARCH='i586' ;; *fedora*) GLOBAL_SETTINGS="BASEURL PACKAGEKEYS" REPO_TYPE="rpm-md" NAME_DEST_ROOT="rpm-root" - X86_ARCH='i386' - X86_KERNEL_ARCH='i586' ;; *ubuntu*) GLOBAL_SETTINGS="BASEURL COMPONENTS DISTRIBUTION" @@ -667,11 +655,7 @@ function slxossetup() if test -z "${SLX_INST_ARCH}"; then SLX_INST_ARCH=$( uname -m) case "${SLX_INST_ARCH}" in - i*86) - SLX_INST_ARCH="${X86_ARCH}" - test "${X86_KERNEL_ARCH}" && \ - SLX_KERNEL_ARCH="${X86_KERNEL_ARCH}" - ;; + i*86) SLX_INST_ARCH="${X86_ARCH}" ;; x86_64) SLX_INST_ARCH='x86_64' ;; *) ErrorMsg 1 "Unsupported machine hardware ${SLX_INST_ARCH}." |