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

6 files changed, 328 insertions, 362 deletions

diff --git a/installer/slxbootstrap b/installer/slxbootstrap
index 9ec77ccf..0db8957b 100755
--- a/installer/slxbootstrap
+++ b/installer/slxbootstrap
@@ -11,27 +11,9 @@ test -f /etc/slxbootstrap.conf
 
 test "${SLX_INST_SOURCE_PACKAGE_SUBDIR}" && \
 	SLX_INST_SOURCE_PACKAGE_SUBDIR="/${SLX_INST_SOURCE_PACKAGE_SUBDIR}"
-test "${SLX_KERNEL_ARCH}" || \
-	SLX_KERNEL_ARCH="${SLX_INST_ARCH}"
 
 download_file () {
-	case "${file}" in
-		*.deb) : ;;
-		*)
-			if test "${file##*.}" = 'noarch'; then
-				file="${file}.rpm"
-				test "${SLX_INST_SOURCE_PACKAGE_ARCHDIR}" && \
-					arch_sub_dir='/noarch'
-			elif test "${file##*.}" = 'SLX_KERNEL_ARCH'; then
-				file="${file%SLX_KERNEL_ARCH}${SLX_KERNEL_ARCH}.rpm"
-			else
-				file="${file}.${SLX_INST_ARCH}.rpm"
-				test "${SLX_INST_SOURCE_PACKAGE_ARCHDIR}" && \
-					arch_sub_dir="/${SLX_INST_ARCH}"
-			fi
-		;;
-	esac
-	wget "${SLX_INST_SOURCE_BASEURL}${SLX_INST_SOURCE_PACKAGE_SUBDIR}${arch_sub_dir}/${file}"
+	wget "${SLX_INST_SOURCE_BASEURL}${SLX_INST_SOURCE_PACKAGE_SUBDIR}/${file}"
 	if test $? != 0; then
 		if test "${SLX_BOOTSTRAP_FAIL_WGET}" = "no"; then
 			continue
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}."
diff --git a/installer/systems/fedora6/settings b/installer/systems/fedora6/settings
index 70fe39ed..dd93e762 100644
--- a/installer/systems/fedora6/settings
+++ b/installer/systems/fedora6/settings
@@ -14,93 +14,93 @@ SLX_INST_SOURCE_NAME_fedora6="Fedora 6"
 SLX_INST_SOURCE_BASEURL_fedora6update='http://ftp-1.gwdg.de/pub/linux/fedora/linux/core/updates/$releasever/$basearch/'
 SLX_INST_SOURCE_NAME_fedora6update="Fedora 6 updates"
 SLX_BASE_PREREQ_PACKAGES="
-RPMS/beecrypt-4.1.2-10.1.1
-RPMS/bzip2-libs-1.0.3-3
-RPMS/e2fsprogs-libs-1.39-7
-RPMS/elfutils-libelf-0.123-1.fc6
-RPMS/expat-1.95.8-8.2.1
-RPMS/glibc-2.5-3
-RPMS/krb5-libs-1.5-7
-RPMS/libgcc-4.1.1-30
-RPMS/libselinux-1.30.29-2
-RPMS/libsepol-1.12.27-1
-RPMS/libstdc++-4.1.1-30
-RPMS/neon-0.25.5-5.1
-RPMS/popt-1.10.2-32
-RPMS/openssl-0.9.8b-8
-RPMS/rpm-4.4.2-32
-RPMS/rpm-libs-4.4.2-32
-RPMS/sqlite-3.3.6-2
-RPMS/zlib-1.2.3-3 
+RPMS/beecrypt-4.1.2-10.1.1.i386.rpm
+RPMS/bzip2-libs-1.0.3-3.i386.rpm
+RPMS/e2fsprogs-libs-1.39-7.i386.rpm
+RPMS/elfutils-libelf-0.123-1.fc6.i386.rpm
+RPMS/expat-1.95.8-8.2.1.i386.rpm
+RPMS/glibc-2.5-3.i386.rpm
+RPMS/krb5-libs-1.5-7.i386.rpm
+RPMS/libgcc-4.1.1-30.i386.rpm
+RPMS/libselinux-1.30.29-2.i386.rpm
+RPMS/libsepol-1.12.27-1.i386.rpm
+RPMS/libstdc++-4.1.1-30.i386.rpm
+RPMS/neon-0.25.5-5.1.i386.rpm
+RPMS/popt-1.10.2-32.i386.rpm
+RPMS/openssl-0.9.8b-8.i386.rpm
+RPMS/rpm-4.4.2-32.i386.rpm
+RPMS/rpm-libs-4.4.2-32.i386.rpm
+RPMS/sqlite-3.3.6-2.i386.rpm
+RPMS/zlib-1.2.3-3.i386.rpm
 "
 SLX_BASE_BOOTSTRAP_PACKAGES="
-RPMS/audit-libs-1.2.8-1.fc6
-RPMS/basesystem-8.0-5.1.1.noarch
-RPMS/bash-3.1-16.1
-RPMS/chkconfig-1.3.30-1
-RPMS/coreutils-5.97-11
-RPMS/cpio-2.6-19
-RPMS/cracklib-2.8.9-3.1
-RPMS/cracklib-dicts-2.8.9-3.1
-RPMS/db4-4.3.29-9.fc6
-RPMS/device-mapper-1.02.07-3
-RPMS/dmraid-1.0.0.rc13-1.fc6
-RPMS/e2fsprogs-1.39-7
-RPMS/ethtool-3-1.2.2
-RPMS/fedora-release-6-4.noarch
-RPMS/fedora-release-notes-6-3.noarch
-RPMS/filesystem-2.4.0-1
-RPMS/findutils-4.2.27-4.1
-RPMS/gawk-3.1.5-11
-RPMS/gdbm-1.8.0-26.2.1
-RPMS/glib2-2.12.3-2.fc6
-RPMS/glibc-common-2.5-3
-RPMS/grep-2.5.1-54.1
-RPMS/gzip-1.3.5-9
-RPMS/info-4.8-11.1
-RPMS/initscripts-8.45.3-1
-RPMS/iproute-2.6.16-6.fc6
-RPMS/iputils-20020927-41.fc6
-RPMS/kernel-2.6.18-1.2798.fc6.SLX_KERNEL_ARCH
-RPMS/kpartx-0.4.7-5
-RPMS/less-394-4.1
-RPMS/libacl-2.2.39-1.1
-RPMS/libattr-2.4.32-1.1
-RPMS/libcap-1.10-25
-RPMS/libtermcap-2.0.8-46.1
-RPMS/lvm2-2.02.06-4
-RPMS/MAKEDEV-3.23-1.2
-RPMS/mcstrans-0.1.8-3
-RPMS/mingetty-1.07-5.2.2
-RPMS/mkinitrd-5.1.19-1
-RPMS/mktemp-1.5-23.2.2
-RPMS/module-init-tools-3.3-0.pre1.4.17
-RPMS/nash-5.1.19-1
-RPMS/ncurses-5.5-24.20060715
-RPMS/net-tools-1.60-73
-RPMS/pam-0.99.6.2-3.fc6
-RPMS/pcre-6.6-1.1
-RPMS/procps-3.2.7-8
-RPMS/psmisc-22.2-5
-RPMS/python-2.4.3-18.fc6
-RPMS/readline-5.1-1.1
-RPMS/sed-4.1.5-5.fc6
-RPMS/setup-2.5.55-1.noarch
-RPMS/shadow-utils-4.0.17-5
-RPMS/sysklogd-1.4.1-39.2
-RPMS/SysVinit-2.86-14
-RPMS/tar-1.15.1-19
-RPMS/termcap-5.5-1.20060701.1.noarch
-RPMS/tzdata-2006m-2.fc6.noarch
-RPMS/udev-095-14
-RPMS/util-linux-2.13-0.44.fc6
-RPMS/libxml2-2.6.26-2.1.1
-RPMS/python-elementtree-1.2.6-5
-RPMS/python-sqlite-1.1.7-1.2.1
-RPMS/python-urlgrabber-2.9.9-2.noarch
-RPMS/rpm-python-4.4.2-32
-RPMS/yum-3.0-6.noarch
-RPMS/yum-metadata-parser-1.0-8.fc6
+RPMS/audit-libs-1.2.8-1.fc6.i386.rpm
+RPMS/basesystem-8.0-5.1.1.noarch.rpm
+RPMS/bash-3.1-16.1.i386.rpm
+RPMS/chkconfig-1.3.30-1.i386.rpm
+RPMS/coreutils-5.97-11.i386.rpm
+RPMS/cpio-2.6-19.i386.rpm
+RPMS/cracklib-2.8.9-3.1.i386.rpm
+RPMS/cracklib-dicts-2.8.9-3.1.i386.rpm
+RPMS/db4-4.3.29-9.fc6.i386.rpm
+RPMS/device-mapper-1.02.07-3.i386.rpm
+RPMS/dmraid-1.0.0.rc13-1.fc6.i386.rpm
+RPMS/e2fsprogs-1.39-7.i386.rpm
+RPMS/ethtool-3-1.2.2.i386.rpm
+RPMS/fedora-release-6-4.noarch.rpm
+RPMS/fedora-release-notes-6-3.noarch.rpm
+RPMS/filesystem-2.4.0-1.i386.rpm
+RPMS/findutils-4.2.27-4.1.i386.rpm
+RPMS/gawk-3.1.5-11.i386.rpm
+RPMS/gdbm-1.8.0-26.2.1.i386.rpm
+RPMS/glib2-2.12.3-2.fc6.i386.rpm
+RPMS/glibc-common-2.5-3.i386.rpm
+RPMS/grep-2.5.1-54.1.i386.rpm
+RPMS/gzip-1.3.5-9.i386.rpm
+RPMS/info-4.8-11.1.i386.rpm
+RPMS/initscripts-8.45.3-1.i386.rpm
+RPMS/iproute-2.6.16-6.fc6.i386.rpm
+RPMS/iputils-20020927-41.fc6.i386.rpm
+RPMS/kernel-2.6.18-1.2798.fc6.i586.rpm
+RPMS/kpartx-0.4.7-5.i386.rpm
+RPMS/less-394-4.1.i386.rpm
+RPMS/libacl-2.2.39-1.1.i386.rpm
+RPMS/libattr-2.4.32-1.1.i386.rpm
+RPMS/libcap-1.10-25.i386.rpm
+RPMS/libtermcap-2.0.8-46.1.i386.rpm
+RPMS/lvm2-2.02.06-4.i386.rpm
+RPMS/MAKEDEV-3.23-1.2.i386.rpm
+RPMS/mcstrans-0.1.8-3.i386.rpm
+RPMS/mingetty-1.07-5.2.2.i386.rpm
+RPMS/mkinitrd-5.1.19-1.i386.rpm
+RPMS/mktemp-1.5-23.2.2.i386.rpm
+RPMS/module-init-tools-3.3-0.pre1.4.17.i386.rpm
+RPMS/nash-5.1.19-1.i386.rpm
+RPMS/ncurses-5.5-24.20060715.i386.rpm
+RPMS/net-tools-1.60-73.i386.rpm
+RPMS/pam-0.99.6.2-3.fc6.i386.rpm
+RPMS/pcre-6.6-1.1.i386.rpm
+RPMS/procps-3.2.7-8.i386.rpm
+RPMS/psmisc-22.2-5.i386.rpm
+RPMS/python-2.4.3-18.fc6.i386.rpm
+RPMS/readline-5.1-1.1.i386.rpm
+RPMS/sed-4.1.5-5.fc6.i386.rpm
+RPMS/setup-2.5.55-1.noarch.rpm
+RPMS/shadow-utils-4.0.17-5.i386.rpm
+RPMS/sysklogd-1.4.1-39.2.i386.rpm
+RPMS/SysVinit-2.86-14.i386.rpm
+RPMS/tar-1.15.1-19.i386.rpm
+RPMS/termcap-5.5-1.20060701.1.noarch.rpm
+RPMS/tzdata-2006m-2.fc6.noarch.rpm
+RPMS/udev-095-14.i386.rpm
+RPMS/util-linux-2.13-0.44.fc6.i386.rpm
+RPMS/libxml2-2.6.26-2.1.1.i386.rpm
+RPMS/python-elementtree-1.2.6-5.i386.rpm
+RPMS/python-sqlite-1.1.7-1.2.1.i386.rpm
+RPMS/python-urlgrabber-2.9.9-2.noarch.rpm
+RPMS/rpm-python-4.4.2-32.i386.rpm
+RPMS/yum-3.0-6.noarch.rpm
+RPMS/yum-metadata-parser-1.0-8.fc6.i386.rpm
 "
 #SLX_BASE_PREREQ_CLEANUP_PATH="etc/localtime etc/nsswitch.conf etc/rpc usr/lib/gconv/gconv-modules"
 SLX_INSTALL_BIND_MOUNT="sys"
diff --git a/installer/systems/opensuse102/settings b/installer/systems/opensuse102/settings
index 293e3592..3464be0f 100644
--- a/installer/systems/opensuse102/settings
+++ b/installer/systems/opensuse102/settings
@@ -13,78 +13,78 @@ SLX_INST_SOURCE_TYPE_opensuse102="yast2"
 SLX_INST_SOURCE_BASEURL_opensuse102update="http://ftp.gwdg.de/pub/suse/update/10.2"
 SLX_INST_SOURCE_NAME_opensuse102update="openSUSE 10.2 updates"
 SLX_BASE_PREREQ_PACKAGES="
-bzip2-1.0.3-36
-glibc-2.5-25
-popt-1.7-304
-rpm-4.4.2-76
-zlib-1.2.3-33
+i586/bzip2-1.0.3-36.i586.rpm
+i586/glibc-2.5-25.i586.rpm
+i586/popt-1.7-304.i586.rpm
+i586/rpm-4.4.2-76.i586.rpm
+i586/zlib-1.2.3-33.i586.rpm
 "
 SLX_BASE_BOOTSTRAP_PACKAGES="
-aaa_base-10.2-38
-aaa_skel-2006.5.19-20
-audit-libs-1.2.6-20
-bash-3.1-55
-blocxx-1.0.0-36
-coreutils-6.4-10
-cpio-2.6-40
-cracklib-2.8.9-20
-cyrus-sasl-2.1.22-28
-db-4.4.20-16
-diffutils-2.8.7-38
-e2fsprogs-1.39-21
-file-4.17-23
-filesystem-10.2-22
-fillup-1.42-138
-findutils-4.2.28-24
-gawk-3.1.5-41
-gdbm-1.8.3-261
-gpg-1.4.5-24
-grep-2.5.1a-40
-gzip-1.3.5-178
-info-4.8-43
-insserv-1.04.0-42
-irqbalance-0.09-80
-kernel-default-2.6.18.2-34
-libacl-2.2.34-33
-libattr-2.4.28-38
-libcom_err-1.39-21
-libgcc41-4.1.2_20061115-5
-libstdc++41-4.1.2_20061115-5
-libvolume_id-103-12
-libxcrypt-2.4-30
-libzio-0.2-20
-limal-1.2.9-5
-limal-bootloader-1.2.4-6
-limal-perl-1.2.9-5
-logrotate-3.7.4-21
-mdadm-2.5.3-17
-mingetty-0.9.6s-107
-mkinitrd-1.2-149
-mktemp-1.5-763
-module-init-tools-3.2.2-62
-ncurses-5.5-42
-net-tools-1.60-606
-openldap2-client-2.3.27-25
-openssl-0.9.8d-17
-openSUSE-release-10.2-35
-pam-0.99.6.3-24
-pciutils-2.2.4-13
-pcre-6.7-21
-perl-5.8.8-32
-perl-Bootloader-0.4.5-3
-perl-gettext-1.05-31
-permissions-2006.11.13-5
-readline-5.1-55
-reiserfs-3.6.19-37
-sed-4.1.5-21
-sysvinit-2.86-47
-udev-103-12
-util-linux-2.12r-61
-pciutils-ids-2006.11.18-2.noarch
-suse-build-key-1.0-707.noarch
-rpm-python-4.4.2-76
-python-xml-2.5-19
-python-2.5-19
-smart-0.42-43
+i586/aaa_base-10.2-38.i586.rpm
+i586/aaa_skel-2006.5.19-20.i586.rpm
+i586/audit-libs-1.2.6-20.i586.rpm
+i586/bash-3.1-55.i586.rpm
+i586/blocxx-1.0.0-36.i586.rpm
+i586/coreutils-6.4-10.i586.rpm
+i586/cpio-2.6-40.i586.rpm
+i586/cracklib-2.8.9-20.i586.rpm
+i586/cyrus-sasl-2.1.22-28.i586.rpm
+i586/db-4.4.20-16.i586.rpm
+i586/diffutils-2.8.7-38.i586.rpm
+i586/e2fsprogs-1.39-21.i586.rpm
+i586/file-4.17-23.i586.rpm
+i586/filesystem-10.2-22.i586.rpm
+i586/fillup-1.42-138.i586.rpm
+i586/findutils-4.2.28-24.i586.rpm
+i586/gawk-3.1.5-41.i586.rpm
+i586/gdbm-1.8.3-261.i586.rpm
+i586/gpg-1.4.5-24.i586.rpm
+i586/grep-2.5.1a-40.i586.rpm
+i586/gzip-1.3.5-178.i586.rpm
+i586/info-4.8-43.i586.rpm
+i586/insserv-1.04.0-42.i586.rpm
+i586/irqbalance-0.09-80.i586.rpm
+i586/kernel-default-2.6.18.2-34.i586.rpm
+i586/libacl-2.2.34-33.i586.rpm
+i586/libattr-2.4.28-38.i586.rpm
+i586/libcom_err-1.39-21.i586.rpm
+i586/libgcc41-4.1.2_20061115-5.i586.rpm
+i586/libstdc++41-4.1.2_20061115-5.i586.rpm
+i586/libvolume_id-103-12.i586.rpm
+i586/libxcrypt-2.4-30.i586.rpm
+i586/libzio-0.2-20.i586.rpm
+i586/limal-1.2.9-5.i586.rpm
+i586/limal-bootloader-1.2.4-6.i586.rpm
+i586/limal-perl-1.2.9-5.i586.rpm
+i586/logrotate-3.7.4-21.i586.rpm
+i586/mdadm-2.5.3-17.i586.rpm
+i586/mingetty-0.9.6s-107.i586.rpm
+i586/mkinitrd-1.2-149.i586.rpm
+i586/mktemp-1.5-763.i586.rpm
+i586/module-init-tools-3.2.2-62.i586.rpm
+i586/ncurses-5.5-42.i586.rpm
+i586/net-tools-1.60-606.i586.rpm
+i586/openldap2-client-2.3.27-25.i586.rpm
+i586/openssl-0.9.8d-17.i586.rpm
+i586/openSUSE-release-10.2-35.i586.rpm
+i586/pam-0.99.6.3-24.i586.rpm
+i586/pciutils-2.2.4-13.i586.rpm
+i586/pcre-6.7-21.i586.rpm
+i586/perl-5.8.8-32.i586.rpm
+i586/perl-Bootloader-0.4.5-3.i586.rpm
+i586/perl-gettext-1.05-31.i586.rpm
+i586/permissions-2006.11.13-5.i586.rpm
+i586/readline-5.1-55.i586.rpm
+i586/reiserfs-3.6.19-37.i586.rpm
+i586/sed-4.1.5-21.i586.rpm
+i586/sysvinit-2.86-47.i586.rpm
+i586/udev-103-12.i586.rpm
+i586/util-linux-2.12r-61.i586.rpm
+noarch/pciutils-ids-2006.11.18-2.noarch.rpm
+noarch/suse-build-key-1.0-707.noarch.rpm
+i586/rpm-python-4.4.2-76.i586.rpm
+i586/python-xml-2.5-19.i586.rpm
+i586/python-2.5-19.i586.rpm
+i586/smart-0.42-43.i586.rpm
 "
 SLX_BASE_PREREQ_CLEANUP_PATH="etc"
diff --git a/installer/systems/suse100/settings b/installer/systems/suse100/settings
index 3da2fa36..20415c4f 100644
--- a/installer/systems/suse100/settings
+++ b/installer/systems/suse100/settings
@@ -13,90 +13,90 @@ SLX_INST_SOURCE_TYPE_suse100="yast2"
 SLX_INST_SOURCE_BASEURL_suse100update="http://ftp.gwdg.de/pub/suse/update/10.0"
 SLX_INST_SOURCE_NAME_suse100update="SUSE Linux 10.0 updates"
 SLX_BASE_PREREQ_PACKAGES="
-bzip2-1.0.3-5
-glibc-2.3.5-40
-popt-1.7-221
-rpm-4.1.1-222
-zlib-1.2.3-3
+i586/bzip2-1.0.3-5.i586.rpm
+i586/glibc-2.3.5-40.i586.rpm
+i586/popt-1.7-221.i586.rpm
+i586/rpm-4.1.1-222.i586.rpm
+i586/zlib-1.2.3-3.i586.rpm
 "
 SLX_BASE_BOOTSTRAP_PACKAGES="
-aaa_base-10.0-28
-aaa_skel-2005.9.7-2
-ash-1.6.1-4
-audit-libs-1.0.3-2
-bash-3.0-17
-blocxx-0.9.20050812-2
-coreutils-5.3.0-20
-cpio-2.6-6
-cracklib-2.8.3.0.7-2
-cyrus-sasl-2.1.21-3
-db-4.3.27-7
-devs-10.0-1
-diffutils-2.8.7-5
-e2fsprogs-1.38-4
-expat-1.95.8-5
-file-4.14-3
-filesystem-10.0-4
-fillup-1.42-106
-findutils-4.2.23-5
-gawk-3.1.4-9
-gdbm-1.8.3-232
-gpg-1.4.2-5
-grep-2.5.1a-5
-gzip-1.3.5-144
-info-4.8-9
-insserv-1.01.0-2
-irqbalance-0.09-43
-kernel-default-2.6.13-15
-klibc-1.0.14-14
-klibc-utils-1.0.14-14
-libacl-2.2.31-3
-libattr-2.4.24-2
-libcom_err-1.38-4
-libgcc-4.0.2_20050901-3
-libselinux-1.23.11-3
-libstdc++-4.0.2_20050901-3
-libxcrypt-2.2-5
-libxml2-2.6.20-4
-libxml2-python-2.6.20-4
-libzio-0.1-6
-limal-1.0.8-2
-limal-bootloader-1.0.5-2
-limal-perl-1.0.8-2
-logrotate-3.7.1-3
-mdadm-1.12.0-2
-mingetty-0.9.6s-77
-mktemp-1.5-733
-module-init-tools-3.2_pre8-7
-ncurses-5.4-71
-net-tools-1.60-561
-openldap2-client-2.2.27-6
-openssl-0.9.7g-2
-pam-0.80-6
-pciutils-2.1.99_test9-3
-pcre-6.2-2
-perl-5.8.7-5
-perl-Bootloader-0.2-37
-perl-gettext-1.05-2
-permissions-2005.8.30-2
-python-2.4.1-3
-python-elementtree-1.2.6-2
-python-urlgrabber-2.9.6-2
-python-sqlite-1.1.6-2
-python-xml-2.4.1-3
-readline-5.0-9
-reiserfs-3.6.18-5
-rpm-python-4.1.1-222
-sed-4.1.4-5
-sqlite-3.2.2-5
-suse-release-oss-10.0-8
-sysvinit-2.85-52
-tar-1.15.1-9
-udev-068git20050831-9
-util-linux-2.12q-26
-yum-2.4.0-3
-mkinitrd-1.2-48.noarch
-suse-build-key-1.0-668.noarch
+i586/aaa_base-10.0-28.i586.rpm
+i586/aaa_skel-2005.9.7-2.i586.rpm
+i586/ash-1.6.1-4.i586.rpm
+i586/audit-libs-1.0.3-2.i586.rpm
+i586/bash-3.0-17.i586.rpm
+i586/blocxx-0.9.20050812-2.i586.rpm
+i586/coreutils-5.3.0-20.i586.rpm
+i586/cpio-2.6-6.i586.rpm
+i586/cracklib-2.8.3.0.7-2.i586.rpm
+i586/cyrus-sasl-2.1.21-3.i586.rpm
+i586/db-4.3.27-7.i586.rpm
+i586/devs-10.0-1.i586.rpm
+i586/diffutils-2.8.7-5.i586.rpm
+i586/e2fsprogs-1.38-4.i586.rpm
+i586/expat-1.95.8-5.i586.rpm
+i586/file-4.14-3.i586.rpm
+i586/filesystem-10.0-4.i586.rpm
+i586/fillup-1.42-106.i586.rpm
+i586/findutils-4.2.23-5.i586.rpm
+i586/gawk-3.1.4-9.i586.rpm
+i586/gdbm-1.8.3-232.i586.rpm
+i586/gpg-1.4.2-5.i586.rpm
+i586/grep-2.5.1a-5.i586.rpm
+i586/gzip-1.3.5-144.i586.rpm
+i586/info-4.8-9.i586.rpm
+i586/insserv-1.01.0-2.i586.rpm
+i586/irqbalance-0.09-43.i586.rpm
+i586/kernel-default-2.6.13-15.i586.rpm
+i586/klibc-1.0.14-14.i586.rpm
+i586/klibc-utils-1.0.14-14.i586.rpm
+i586/libacl-2.2.31-3.i586.rpm
+i586/libattr-2.4.24-2.i586.rpm
+i586/libcom_err-1.38-4.i586.rpm
+i586/libgcc-4.0.2_20050901-3.i586.rpm
+i586/libselinux-1.23.11-3.i586.rpm
+i586/libstdc++-4.0.2_20050901-3.i586.rpm
+i586/libxcrypt-2.2-5.i586.rpm
+i586/libxml2-2.6.20-4.i586.rpm
+i586/libxml2-python-2.6.20-4.i586.rpm
+i586/libzio-0.1-6.i586.rpm
+i586/limal-1.0.8-2.i586.rpm
+i586/limal-bootloader-1.0.5-2.i586.rpm
+i586/limal-perl-1.0.8-2.i586.rpm
+i586/logrotate-3.7.1-3.i586.rpm
+i586/mdadm-1.12.0-2.i586.rpm
+i586/mingetty-0.9.6s-77.i586.rpm
+i586/mktemp-1.5-733.i586.rpm
+i586/module-init-tools-3.2_pre8-7.i586.rpm
+i586/ncurses-5.4-71.i586.rpm
+i586/net-tools-1.60-561.i586.rpm
+i586/openldap2-client-2.2.27-6.i586.rpm
+i586/openssl-0.9.7g-2.i586.rpm
+i586/pam-0.80-6.i586.rpm
+i586/pciutils-2.1.99_test9-3.i586.rpm
+i586/pcre-6.2-2.i586.rpm
+i586/perl-5.8.7-5.i586.rpm
+i586/perl-Bootloader-0.2-37.i586.rpm
+i586/perl-gettext-1.05-2.i586.rpm
+i586/permissions-2005.8.30-2.i586.rpm
+i586/python-2.4.1-3.i586.rpm
+i586/python-elementtree-1.2.6-2.i586.rpm
+i586/python-urlgrabber-2.9.6-2.i586.rpm
+i586/python-sqlite-1.1.6-2.i586.rpm
+i586/python-xml-2.4.1-3.i586.rpm
+i586/readline-5.0-9.i586.rpm
+i586/reiserfs-3.6.18-5.i586.rpm
+i586/rpm-python-4.1.1-222.i586.rpm
+i586/sed-4.1.4-5.i586.rpm
+i586/sqlite-3.2.2-5.i586.rpm
+i586/suse-release-oss-10.0-8.i586.rpm
+i586/sysvinit-2.85-52.i586.rpm
+i586/tar-1.15.1-9.i586.rpm
+i586/udev-068git20050831-9.i586.rpm
+i586/util-linux-2.12q-26.i586.rpm
+i586/yum-2.4.0-3.i586.rpm
+noarch/mkinitrd-1.2-48.noarch.rpm
+noarch/suse-build-key-1.0-668.noarch.rpm
 "
 SLX_BASE_PREREQ_CLEANUP_PATH="etc"
 SLX_INSTALL_PACKAGES_MAIN=""
diff --git a/installer/systems/suse101/settings b/installer/systems/suse101/settings
index ba7454b5..45c2be2b 100644
--- a/installer/systems/suse101/settings
+++ b/installer/systems/suse101/settings
@@ -13,93 +13,93 @@ SLX_INST_SOURCE_BASEURL_suse101update="http://ftp.gwdg.de/pub/suse/update/10.1"
 SLX_INST_SOURCE_NAME_suse101update="SUSE Linux 10.1 updates"
 SLX_BOOTSTRAP_FAIL_WGET="no"
 SLX_BASE_PREREQ_PACKAGES="
-bzip2-1.0.3-15
-glibc-2.4-25
-glibc-2.4-31.1
-popt-1.7-268
-rpm-4.4.2-40
-rpm-4.4.2-43.4
-zlib-1.2.3-13
+i586/bzip2-1.0.3-15.i586.rpm
+i586/glibc-2.4-25.i586.rpm
+i586/glibc-2.4-31.1.i586.rpm
+i586/popt-1.7-268.i586.rpm
+i586/rpm-4.4.2-40.i586.rpm
+i586/rpm-4.4.2-43.4.i586.rpm
+i586/zlib-1.2.3-13.i586.rpm
 "
 SLX_BASE_BOOTSTRAP_PACKAGES="
-aaa_base-10.1-41
-aaa_skel-2006.3.29-5
-aaa_skel-2006.5.19-0.2
-ash-1.6.1-13
-audit-libs-1.1.3-21
-audit-libs-1.1.3-23.3
-bash-3.1-22
-bash-3.1-24.3
-blocxx-1.0.0-15
-coreutils-5.93-20
-cpio-2.6-17
-cracklib-2.8.6-12
-cyrus-sasl-2.1.21-18
-db-4.3.29-13
-diffutils-2.8.7-15
-e2fsprogs-1.38-25
-expat-2.0.0-11
-file-4.16-13
-file-4.16-15.4
-filesystem-10.1-5
-fillup-1.42-116
-findutils-4.2.27-12
-gawk-3.1.5-18
-gdbm-1.8.3-241
-gpg-1.4.2-23
-gpg-1.4.2-23.7
-grep-2.5.1a-18
-gzip-1.3.5-157
-gzip-1.3.5-159.5
-info-4.8-20
-insserv-1.04.0-18
-irqbalance-0.09-58
-kernel-default-2.6.16.21-0.25
-libacl-2.2.34-12
-libattr-2.4.28-14
-libcom_err-1.38-25
-libgcc-4.1.0-25
-libstdc++-4.1.0-25
-libxcrypt-2.4-10
-libzio-0.1-15
-limal-1.1.6-8
-limal-bootloader-1.1.2-7
-limal-perl-1.1.6-8
-logrotate-3.7.3-11
-mdadm-2.2-30
-mingetty-0.9.6s-86
-mkinitrd-1.2-103
-mkinitrd-1.2-106.19
-mktemp-1.5-742
-module-init-tools-3.2.2-32
-module-init-tools-3.2.2-32.13
-ncurses-5.5-16
-net-tools-1.60-581
-openldap2-client-2.3.19-18
-openssl-0.9.8a-16
-openssl-0.9.8a-18.10
-pam-0.99.3.0-25
-pam-0.99.3.0-29.3
-pciutils-2.2.1-14
-pcre-6.4-12
-perl-5.8.8-12
-perl-Bootloader-0.2.20-7
-perl-Bootloader-0.2.27-0.4
-perl-gettext-1.05-11
-permissions-2006.2.24-8
-python-2.4.2-18
-python-elementtree-1.2.6-18
-python-xml-2.4.2-18
-readline-5.1-22
-reiserfs-3.6.19-17
-rpm-python-4.4.2-40
-sed-4.1.4-15
-smart-0.41-23
-smart-0.41-23.2
-suse-release-10.1-9
-sysvinit-2.86-19
-udev-085-29
-udev-085-30.15
-util-linux-2.12r-35
-suse-build-key-1.0-685.noarch
+i586/aaa_base-10.1-41.i586.rpm
+i586/aaa_skel-2006.3.29-5.i586.rpm
+i586/aaa_skel-2006.5.19-0.2.i586.rpm
+i586/ash-1.6.1-13.i586.rpm
+i586/audit-libs-1.1.3-21.i586.rpm
+i586/audit-libs-1.1.3-23.3.i586.rpm
+i586/bash-3.1-22.i586.rpm
+i586/bash-3.1-24.3.i586.rpm
+i586/blocxx-1.0.0-15.i586.rpm
+i586/coreutils-5.93-20.i586.rpm
+i586/cpio-2.6-17.i586.rpm
+i586/cracklib-2.8.6-12.i586.rpm
+i586/cyrus-sasl-2.1.21-18.i586.rpm
+i586/db-4.3.29-13.i586.rpm
+i586/diffutils-2.8.7-15.i586.rpm
+i586/e2fsprogs-1.38-25.i586.rpm
+i586/expat-2.0.0-11.i586.rpm
+i586/file-4.16-13.i586.rpm
+i586/file-4.16-15.4.i586.rpm
+i586/filesystem-10.1-5.i586.rpm
+i586/fillup-1.42-116.i586.rpm
+i586/findutils-4.2.27-12.i586.rpm
+i586/gawk-3.1.5-18.i586.rpm
+i586/gdbm-1.8.3-241.i586.rpm
+i586/gpg-1.4.2-23.i586.rpm
+i586/gpg-1.4.2-23.7.i586.rpm
+i586/grep-2.5.1a-18.i586.rpm
+i586/gzip-1.3.5-157.i586.rpm
+i586/gzip-1.3.5-159.5.i586.rpm
+i586/info-4.8-20.i586.rpm
+i586/insserv-1.04.0-18.i586.rpm
+i586/irqbalance-0.09-58.i586.rpm
+i586/kernel-default-2.6.16.21-0.25.i586.rpm
+i586/libacl-2.2.34-12.i586.rpm
+i586/libattr-2.4.28-14.i586.rpm
+i586/libcom_err-1.38-25.i586.rpm
+i586/libgcc-4.1.0-25.i586.rpm
+i586/libstdc++-4.1.0-25.i586.rpm
+i586/libxcrypt-2.4-10.i586.rpm
+i586/libzio-0.1-15.i586.rpm
+i586/limal-1.1.6-8.i586.rpm
+i586/limal-bootloader-1.1.2-7.i586.rpm
+i586/limal-perl-1.1.6-8.i586.rpm
+i586/logrotate-3.7.3-11.i586.rpm
+i586/mdadm-2.2-30.i586.rpm
+i586/mingetty-0.9.6s-86.i586.rpm
+i586/mkinitrd-1.2-103.i586.rpm
+i586/mkinitrd-1.2-106.19.i586.rpm
+i586/mktemp-1.5-742.i586.rpm
+i586/module-init-tools-3.2.2-32.i586.rpm
+i586/module-init-tools-3.2.2-32.13.i586.rpm
+i586/ncurses-5.5-16.i586.rpm
+i586/net-tools-1.60-581.i586.rpm
+i586/openldap2-client-2.3.19-18.i586.rpm
+i586/openssl-0.9.8a-16.i586.rpm
+i586/openssl-0.9.8a-18.10.i586.rpm
+i586/pam-0.99.3.0-25.i586.rpm
+i586/pam-0.99.3.0-29.3.i586.rpm
+i586/pciutils-2.2.1-14.i586.rpm
+i586/pcre-6.4-12.i586.rpm
+i586/perl-5.8.8-12.i586.rpm
+i586/perl-Bootloader-0.2.20-7.i586.rpm
+i586/perl-Bootloader-0.2.27-0.4.i586.rpm
+i586/perl-gettext-1.05-11.i586.rpm
+i586/permissions-2006.2.24-8.i586.rpm
+i586/python-2.4.2-18.i586.rpm
+i586/python-elementtree-1.2.6-18.i586.rpm
+i586/python-xml-2.4.2-18.i586.rpm
+i586/readline-5.1-22.i586.rpm
+i586/reiserfs-3.6.19-17.i586.rpm
+i586/rpm-python-4.4.2-40.i586.rpm
+i586/sed-4.1.4-15.i586.rpm
+i586/smart-0.41-23.i586.rpm
+i586/smart-0.41-23.2.i586.rpm
+i586/suse-release-10.1-9.i586.rpm
+i586/sysvinit-2.86-19.i586.rpm
+i586/udev-085-29.i586.rpm
+i586/udev-085-30.15.i586.rpm
+i586/util-linux-2.12r-35.i586.rpm
+noarch/suse-build-key-1.0-685.noarch.rpm
 "