Add SLX_BASE_BOOTSTRAP_PREREQ_PACKAGES to settings for RPM based systems

where we have to cheat.  In the particular case of SUSE Linux 9.3 the
suse-build-key uses mktemp but does not have mktemp in the prerequired
list of packages.  Therefore the call to rpm with all packages returns
non zero as the postinstall scriptlet of the suse-build-key failed.

To ensure a clean system we delete the just built RPM database and
inklude the BOOTSTRAP_PREREQ_PACKAGES with the install of all other
packages.

Add the list of SUSE Linux 9.3 package to bootstrap the basic system.

Unfortunately smart nor yum is included in the vanilla SUSE Linux 9.3.
Therefore we're not yet able to install or update packages from the
configured installation sources.


git-svn-id: http://svn.openslx.org/svn/openslx/trunk@633 95ad53e4-c205-0410-b2fa-d234c58c8868

4 files changed, 105 insertions, 14 deletions

diff --git a/installer/slxbootstrap b/installer/slxbootstrap
index 0db8957b..6dcc2622 100755
--- a/installer/slxbootstrap
+++ b/installer/slxbootstrap
@@ -61,7 +61,7 @@ for file in ${SLX_BASE_PREREQ_PACKAGES}; do
 	esac
 done
 
-for file in ${SLX_BASE_BOOTSTRAP_PACKAGES}; do
+for file in ${SLX_BASE_BOOTSTRAP_PACKAGES} ${SLX_BASE_BOOTSTRAP_PREREQ_PACKAGES}; do
 	download_file
 done
 
diff --git a/installer/slxossetup b/installer/slxossetup
index c6dbe947..1ff83bb8 100755
--- a/installer/slxossetup
+++ b/installer/slxossetup
@@ -144,6 +144,7 @@ function setup_busybox_stage1_config()
 
 	for key in \
 		SLX_BASE_BOOTSTRAP_PACKAGES \
+		SLX_BASE_BOOTSTRAP_PREREQ_PACKAGES \
 		SLX_BASE_PREREQ_PACKAGES \
 		SLX_BOOTSTRAP_FAIL_WGET \
 		SLX_STAGE1_FINAL_PATH \
@@ -189,6 +190,19 @@ function setup_bootstrap_1b()
 	fi
 }
 
+function create_package_list()
+{
+	local file packagelist
+	packagelist=$@
+
+	for file in ${packagelist}; do
+		test "${SLX_BOOTSTRAP_FAIL_WGET}" = "no" -a \
+			! -f ${CHROOT_DIR}/${SLX_BOOTSTRAP_PATH}/${file##*/} && \
+			continue
+		echo -n "${file##*/} "
+	done
+}
+
 function setup_bootstrap_1c()
 {
 	local dir file packagelist packagekey rc
@@ -223,15 +237,18 @@ function setup_bootstrap_1c()
 				chroot "${CHROOT_DIR}/${SLX_BOOTSTRAP_PATH}" \
 					/bin/rpm --root="${SLX_STAGE1_FINAL_PATH}" --import "${packagekey}"
 			done
-			for file in ${SLX_BASE_PREREQ_PACKAGES} ${SLX_BASE_BOOTSTRAP_PACKAGES}; do
-				test "${SLX_BOOTSTRAP_FAIL_WGET}" = "no" -a \
-					! -f ${CHROOT_DIR}/${SLX_BOOTSTRAP_PATH}/${file##*/} && \
-					continue
-				packagelist="${packagelist} ${file##*/}"
-			done
+			packagelist=$( create_package_list ${SLX_BASE_BOOTSTRAP_PREREQ_PACKAGES})
+			if test "${packagelist}"; then
+				chroot "${CHROOT_DIR}/${SLX_BOOTSTRAP_PATH}" \
+					/bin/rpm --root="${SLX_STAGE1_FINAL_PATH}" \
+						-ivh --nodeps --noscripts --force \
+						${packagelist}
+				# Remove RPM DB; else the following call to rpm fails.
+				rm -rf "${CHROOT_DIR}/${SLX_BOOTSTRAP_PATH}/${SLX_STAGE1_FINAL_PATH}/var/lib/rpm"
+			fi
+			packagelist=$( create_package_list ${SLX_BASE_PREREQ_PACKAGES} ${SLX_BASE_BOOTSTRAP_PACKAGES} ${SLX_BASE_BOOTSTRAP_PREREQ_PACKAGES})
 			test -z "{packagelist}" && \
 				ErrorMsg 1 "Packagelist to bootstrap from ${CHROOT_DIR}/${SLX_BOOTSTRAP_PATH} is empty."
-
 			chroot "${CHROOT_DIR}/${SLX_BOOTSTRAP_PATH}" \
 				/bin/rpm --root="${SLX_STAGE1_FINAL_PATH}" -ivh ${packagelist}
 			rc=$?
diff --git a/installer/systems/suse93/settings b/installer/systems/suse93/settings
index baf9608f..65ecb86a 100644
--- a/installer/systems/suse93/settings
+++ b/installer/systems/suse93/settings
@@ -1,12 +1,86 @@
-# Currently not working as SUSE Linux 9.3 doesn't provide repo data
-SLX_INST_SOURCE_BASEURL_suse93="http://ftp.gwdg.de/pub/suse/install/9.3"
-SLX_INST_SOURCE_PACKAGEKEYS_suse93="
+SLX_INST_SOURCE_BASEURL="http://ftp.gwdg.de/pub/suse/install/9.3"
+SLX_INST_SOURCE_PACKAGE_SUBDIR="suse"
+SLX_INST_SOURCE_PACKAGEKEYS="
 gpg-pubkey-0dfb3188-41ed929b.asc
 gpg-pubkey-3d25d3d9-36e12d04.asc
 gpg-pubkey-9c800aca-40d8063e.asc
 "
 SLX_INST_SOURCE_NAME_suse93="SUSE Linux 9.3"
-SLX_INST_SOURCE_TYPE_suse93="yast2"
+SLX_INST_SOURCE_REPO_SUBDIR_suse93="suse"
 SLX_INST_SOURCE_BASEURL_suse93update="http://ftp.gwdg.de/pub/suse/update/9.3"
 SLX_INST_SOURCE_NAME_suse93update="SUSE Linux 9.3 updates"
-SLX_BASE_PREREQ_PACKAGES="glibc"
+SLX_BASE_PREREQ_PACKAGES="
+i586/bzip2-1.0.2-348.i586.rpm
+i586/glibc-2.3.4-23.2.i586.rpm
+i586/popt-1.7-207.i586.rpm
+i586/rpm-4.1.1-208.i586.rpm
+i586/zlib-1.2.2-5.i586.rpm
+"
+SLX_BASE_BOOTSTRAP_PREREQ_PACKAGES="
+i586/mktemp-1.5-732.i586.rpm
+"
+SLX_BASE_BOOTSTRAP_PACKAGES="
+i586/aaa_base-9.3-9.2.i586.rpm
+i586/aaa_skel-2005.2.1-3.i586.rpm
+i586/ash-1.6.1-2.i586.rpm
+i586/bash-3.0-15.i586.rpm
+i586/coreutils-5.3.0-10.i586.rpm
+i586/cpio-2.5-328.i586.rpm
+i586/cracklib-2.7-1010.i586.rpm
+i586/cyrus-sasl-2.1.20-7.i586.rpm
+i586/db-4.3.27-3.i586.rpm
+i586/devs-9.3-2.i586.rpm
+i586/diffutils-2.8.7-4.i586.rpm
+i586/e2fsprogs-1.36-5.i586.rpm
+i586/expat-1.95.8-4.i586.rpm
+i586/file-4.13-5.i586.rpm
+i586/filesystem-9.3-2.i586.rpm
+i586/fillup-1.42-101.i586.rpm
+i586/findutils-4.2.19-3.i586.rpm
+i586/gawk-3.1.4-7.i586.rpm
+i586/gdbm-1.8.3-230.i586.rpm
+i586/gpg-1.4.0-4.i586.rpm
+i586/grep-2.5.1a-4.i586.rpm
+i586/gzip-1.3.5-140.i586.rpm
+i586/info-4.8-7.i586.rpm
+i586/insserv-1.00.8-4.i586.rpm
+i586/irqbalance-0.09-40.i586.rpm
+i586/libacl-2.2.30-3.i586.rpm
+i586/libattr-2.4.22-3.i586.rpm
+i586/libgcc-3.3.5-5.i586.rpm
+i586/libselinux-1.21.7-3.i586.rpm
+i586/libstdc++-3.3.5-5.i586.rpm
+i586/libxcrypt-2.2-3.i586.rpm
+i586/libxml2-2.6.17-4.i586.rpm
+i586/libxml2-python-2.6.17-4.i586.rpm
+i586/libzio-0.1-5.i586.rpm
+i586/logrotate-3.7-35.i586.rpm
+i586/mdadm-1.9.0-3.2.i586.rpm
+i586/mingetty-0.9.6s-76.i586.rpm
+i586/module-init-tools-3.2_pre1-7.i586.rpm
+i586/ncurses-5.4-68.i586.rpm
+i586/net-tools-1.60-556.i586.rpm
+i586/openldap2-client-2.2.23-6.i586.rpm
+i586/openssl-0.9.7e-3.i586.rpm
+i586/pam-0.78-8.i586.rpm
+i586/pciutils-2.1.11-201.i586.rpm
+i586/pcre-5.0-3.i586.rpm
+i586/perl-5.8.6-5.i586.rpm
+i586/perl-Bootloader-0.2-17.i586.rpm
+i586/perl-gettext-1.01-579.i586.rpm
+i586/permissions-2005.3.1-3.i586.rpm
+i586/python-2.4-14.i586.rpm
+i586/python-xml-2.4-14.i586.rpm
+i586/readline-5.0-7.2.i586.rpm
+i586/reiserfs-3.6.18-3.i586.rpm
+i586/rpm-python-4.1.1-208.i586.rpm
+i586/sed-4.1.4-3.i586.rpm
+i586/sqlite-3.1.3-3.i586.rpm
+i586/suse-release-9.3-4.i586.rpm
+i586/sysvinit-2.85-38.4.i586.rpm
+i586/tar-1.15.1-5.i586.rpm
+i586/udev-053-15.2.i586.rpm
+i586/util-linux-2.12q-7.2.i586.rpm
+noarch/mkinitrd-1.2-26.noarch.rpm
+noarch/suse-build-key-1.0-665.noarch.rpm
+"
diff --git a/installer/systems/suse93/settings.local.example b/installer/systems/suse93/settings.local.example
index 23e0d074..bd8611e5 100644
--- a/installer/systems/suse93/settings.local.example
+++ b/installer/systems/suse93/settings.local.example
@@ -3,7 +3,7 @@
 # It's also possible to define addditional values here.
 
 # Use a local installation source.
-SLX_INST_SOURCE_BASEURL_suse93="http://ftp-1.gwdg.de/pub/suse/install/9.3"
+SLX_INST_SOURCE_BASEURL="http://ftp-1.gwdg.de/pub/suse/install/9.3"
 SLX_INST_SOURCE_BASEURL_suse93update="http://ftp-1.gwdg.de/pub/suse/update/9.3"
 
 # Add more packages.