Add SLX_BOOTSTRAP_FAIL_WGET. This allows us to tolerate failing wget

calls in the bootstrap environment.

This is required as the SUSE Linux 10.1 exits in two different flavors.
The Genral Availability (GA) and the remastert version.

Till now we did all testing with the remastered CDs.  Therefore we
failed as soon as we tired to use the version available from
openSUSE.org.


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

3 files changed, 25 insertions, 3 deletions

diff --git a/installer/slxbootstrap b/installer/slxbootstrap
index 81a7e2b6..c14c5740 100755
--- a/installer/slxbootstrap
+++ b/installer/slxbootstrap
@@ -2,6 +2,7 @@
 
 PATH="/bin:/sbin:/usr/bin:/usr/sbin"
 
+: ${SLX_BOOTSTRAP_FAIL_WGET:="yes"}
 : ${SLX_BOOTSTRAP_PATH:="/slxbootstrap"}
 : ${SLX_STAGE1_FINAL_PATH:="/slxfinal"}
 
@@ -24,8 +25,12 @@ cd "${SLX_BOOTSTRAP_PATH}"
 for file in ${SLX_BASE_PREREQ_PACKAGES}; do
 	wget "${SLX_INST_SOURCE_BASEURL}${SLX_INST_SOURCE_PACKAGE_SUBDIR:+/${SLX_INST_SOURCE_PACKAGE_SUBDIR}}/${file}"
 	if test $? != 0; then
-		echo "Error: Unable to download ${SLX_INST_SOURCE_BASEURL}/${file}"
-		exit 1
+		if test "${SLX_BOOTSTRAP_FAIL_WGET}" = "no"; then
+			continue
+		else
+			echo "Error: Unable to download ${SLX_INST_SOURCE_BASEURL}/${file}"
+			exit 1
+		fi
 	fi
 	case "${file}" in
 		*.deb)
@@ -51,7 +56,7 @@ done
 
 for file in ${SLX_BASE_BOOTSTRAP_PACKAGES}; do
 	wget "${SLX_INST_SOURCE_BASEURL}${SLX_INST_SOURCE_PACKAGE_SUBDIR:+/${SLX_INST_SOURCE_PACKAGE_SUBDIR}}/${file}"
-	if test $? != 0; then
+	if test $? != 0 -a "${SLX_BOOTSTRAP_FAIL_WGET}" = "yes"; then
 		echo "Error: Unable to download ${SLX_INST_SOURCE_BASEURL}/${file}"
 		exit 1
 	fi
diff --git a/installer/slxossetup b/installer/slxossetup
index 0cf18811..584cadc6 100755
--- a/installer/slxossetup
+++ b/installer/slxossetup
@@ -142,6 +142,7 @@ function setup_busybox_stage1_config()
 	for key in \
 		SLX_BASE_BOOTSTRAP_PACKAGES \
 		SLX_BASE_PREREQ_PACKAGES \
+		SLX_BOOTSTRAP_FAIL_WGET \
 		SLX_STAGE1_FINAL_PATH \
 		SLX_INST_ARCH \
 		SLX_INST_SOURCE_BASEURL \
diff --git a/installer/systems/suse101/settings b/installer/systems/suse101/settings
index 121f2b27..45c2be2b 100644
--- a/installer/systems/suse101/settings
+++ b/installer/systems/suse101/settings
@@ -11,18 +11,24 @@ SLX_INST_SOURCE_NAME_suse101="SUSE Linux 10.1"
 SLX_INST_SOURCE_TYPE_suse101="yast2"
 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="
 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="
 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
@@ -33,14 +39,17 @@ 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
@@ -59,17 +68,22 @@ 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
@@ -80,9 +94,11 @@ 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