Modify configuration for Fedora 6 to work with the new busybox based

concept.

The BASEURL for fedora6update is by intention in single ticks as this
allows us to be more flexible with $releasever and $basearch.

All the changes are tested with x86 32-bit systems only.  With the
current implementation we'll run into trouble with x64_64.

As Fedora does not ship smart we use yum as meta packager.


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

3 files changed, 137 insertions, 19 deletions

diff --git a/installer/slxossetup b/installer/slxossetup
index d02089b4..004c72ea 100755
--- a/installer/slxossetup
+++ b/installer/slxossetup
@@ -144,7 +144,6 @@ function setup_busybox_stage1_config()
 		SLX_BASE_PREREQ_PACKAGES \
 		SLX_STAGE1_FINAL_PATH \
 		SLX_INST_ARCH \
-		SLX_INSTALL_FAKE_FILE \
 		SLX_INST_SOURCE_BASEURL \
 		SLX_INST_SOURCE_DISTRIBUTION \
 		SLX_INST_SOURCE_PACKAGEKEYS \
@@ -179,11 +178,15 @@ function setup_busybox_install_prereq_file()
 function setup_bootstrap_1b()
 {
 	chroot "${CHROOT_DIR}" /bin/slxbootstrap
+	if test $? != 0; then
+		echo "$0: Error while calling /bin/slxbootstrap inside chroot, ${CHROOT_DIR}. "
+		exit 1
+	fi
 }
 
 function setup_bootstrap_1c()
 {
-	local packagekey	
+	local dir file packagekey	
 
 	case "${SLX_SYSTEM_BASENAME}" in
 		*ubuntu*)
@@ -198,10 +201,16 @@ function setup_bootstrap_1c()
 				"${SLX_BOOTSTRAP_PATH}/${SLX_STAGE1_FINAL_PATH}" \
 				"${SLX_INST_SOURCE_BASEURL}"
 		;;
-		*suse*)
+		*suse*|*fedora*)
 			test -d "${CHROOT_DIR}/${SLX_BOOTSTRAP_PATH}/etc" || \
 				mkdir "${CHROOT_DIR}/${SLX_BOOTSTRAP_PATH}/etc"
 			touch "${CHROOT_DIR}/${SLX_BOOTSTRAP_PATH}/etc/mtab"
+			for file in ${SLX_INSTALL_FAKE_FILE}; do
+				dir="${file%/*}"
+				test -d "${CHROOT_DIR}/${SLX_BOOTSTRAP_PATH}/${SLX_STAGE1_FINAL_PATH}/${dir}" || \
+					mkdir -p "${CHROOT_DIR}/${SLX_BOOTSTRAP_PATH}/${SLX_STAGE1_FINAL_PATH}/${dir}"
+				touch "${CHROOT_DIR}/${SLX_BOOTSTRAP_PATH}/${SLX_STAGE1_FINAL_PATH}/${file}"
+			done
 			for packagekey in ${SLX_INST_SOURCE_PACKAGEKEYS}; do
 				chroot "${CHROOT_DIR}/${SLX_BOOTSTRAP_PATH}" \
 					/bin/rpm --root="${SLX_STAGE1_FINAL_PATH}" --import "${packagekey}"
@@ -222,11 +231,14 @@ function setup_package_sources()
 			SOURCES_LIST="${SLX_STAGE1_PATH}/etc/apt/sources.list"
 			rm -f "${SOURCES_LIST}"
 		;;
+		*fedora*)
+			rm -f "${SLX_STAGE1_PATH}/etc/yum.repos.d/"*
+		;;
 	esac
 	# Add available installation sources to an installed system.
 	# For systems using apt we're able to do this from outside.
 	for variable in ${!SLX_INST_SOURCE_NAME_*}; do
-		# Unset INST_SOURCE_* to let smart fail if they are not set for a particular
+		# Unset INST_SOURCE_* to let the meta packager fail if they are not set for a particular
 		# channel; unset PACKAGEKEYS to prevent adding them multiple times.
 		unset INST_SOURCE_COMPONENTS \
 			INST_SOURCE_DISTRIBUTION \
@@ -278,6 +290,10 @@ function setup_package_sources()
 					${INST_SOURCE_PRIORITY} \
 					-y
 			;;
+			*fedora*)
+				echo -e "[${INST_SOURCE_CHANNEL}]\nname=${INST_SOURCE_NAME}\nbaseurl=${INST_SOURCE_BASEURL}" \
+					>${SLX_STAGE1_PATH}/etc/yum.repos.d/${INST_SOURCE_CHANNEL}.repo
+			;;
 		esac
 	done
 }
@@ -295,12 +311,18 @@ function update_system()
 		*ubuntu*)
 			: ${SLX_STAGE1_UPDATE_OPTIONS:=-y}
 			: ${SLX_STAGE1_UPGRADE_OPTIONS:=-y}
-			chroot "${SLX_STAGE1_PATH}" apt-get update "${SLX_STAGE1_UPDATE_OPTIONS}"
-			chroot "${SLX_STAGE1_PATH}" apt-get upgrade "${SLX_STAGE1_UPGRADE_OPTIONS}"
+			chroot "${SLX_STAGE1_PATH}" apt-get update ${SLX_STAGE1_UPDATE_OPTIONS}
+			chroot "${SLX_STAGE1_PATH}" apt-get upgrade ${SLX_STAGE1_UPGRADE_OPTIONS}
 		;;
 		*suse*)
 			: ${SLX_STAGE1_UPGRADE_OPTIONS:=-y}
-			LC_ALL=POSIX chroot "${SLX_STAGE1_PATH}" smart upgrade --update "${SLX_STAGE1_UPGRADE_OPTIONS}"
+			LC_ALL=POSIX chroot "${SLX_STAGE1_PATH}" smart upgrade --update ${SLX_STAGE1_UPGRADE_OPTIONS}
+		;;
+		*fedora*)
+			: ${SLX_STAGE1_UPDATE_OPTIONS:=-y}
+			cp -p /proc/cpuinfo "${SLX_STAGE1_PATH}/proc/cpuinfo"
+			chroot "${SLX_STAGE1_PATH}" yum ${SLX_STAGE1_UPDATE_OPTIONS} update
+			rm "${SLX_STAGE1_PATH}/proc/cpuinfo"
 		;;
 	esac
 }
@@ -322,11 +344,17 @@ function install_slxselection()
 	case "${SLX_SYSTEM_BASENAME}" in
 		*ubuntu*)
 			: ${SLX_STAGE1_INSTALL_OPTIONS:=-y}
-			chroot "${SLX_STAGE1_PATH}" apt-get install "${SLX_STAGE1_INSTALL_OPTIONS}" ${packagelist}
+			chroot "${SLX_STAGE1_PATH}" apt-get install ${SLX_STAGE1_INSTALL_OPTIONS} ${packagelist}
 		;;
 		*suse*)
-			: ${SLX_STAGE1_UPGRADE_OPTIONS:=-y}
-			LC_ALL=POSIX chroot "${SLX_STAGE1_PATH}" smart install "${SLX_STAGE1_UPGRADE_OPTIONS}" ${packagelist}
+			: ${SLX_STAGE1_INSTALL_OPTIONS:=-y}
+			LC_ALL=POSIX chroot "${SLX_STAGE1_PATH}" smart install ${SLX_STAGE1_INSTALL_OPTIONS} ${packagelist}
+		;;
+		*fedora*)
+			: ${SLX_STAGE1_INSTALL_OPTIONS:=-y}
+			cp -p /proc/cpuinfo "${SLX_STAGE1_PATH}/proc/cpuinfo"
+			chroot "${SLX_STAGE1_PATH}" yum ${SLX_STAGE1_INSTALL_OPTIONS} install ${packagelist}
+			rm "${SLX_STAGE1_PATH}/proc/cpuinfo"
 		;;
 	esac
 }
@@ -588,6 +616,7 @@ function slxossetup()
 			NAME_DEST_ROOT="rpm-root"
 			;;
 		*fedora*)
+			GLOBAL_SETTINGS="BASEURL PACKAGEKEYS"
 			REPO_TYPE="rpm-md"
 			NAME_DEST_ROOT="rpm-root"
 			;;
diff --git a/installer/systems/fedora6/settings b/installer/systems/fedora6/settings
index 08617d4a..14c02964 100644
--- a/installer/systems/fedora6/settings
+++ b/installer/systems/fedora6/settings
@@ -1,5 +1,6 @@
-SLX_INST_SOURCE_BASEURL_fedora6="http://ftp.gwdg.de/pub/linux/fedora/linux/core/6/i386/os"
-SLX_INST_SOURCE_PACKAGEKEYS_fedora6="
+SLX_INST_SOURCE_BASEURL="http://ftp.gwdg.de/pub/linux/fedora/linux/core/6/i386/os"
+SLX_INST_SOURCE_PACKAGE_SUBDIR="Fedora"
+SLX_INST_SOURCE_PACKAGEKEYS="
 RPM-GPG-KEY
 RPM-GPG-KEY-beta
 RPM-GPG-KEY-fedora
@@ -10,10 +11,98 @@ RPM-GPG-KEY-fedora-test
 RPM-GPG-KEY-rawhide
 "
 SLX_INST_SOURCE_NAME_fedora6="Fedora 6"
-#SLX_INST_SOURCE_BASEURL_fedora6update="http://ftp.gwdg.de/pub/linux/fedora/linux/core/updates/6"
-#SLX_INST_SOURCE_NAME_fedora6update="Fedora 6 updates"
-SLX_BASE_PREREQ_PACKAGES="glibc"
-SLX_BASE_PREREQ_CLEANUP_PATH="etc/localtime etc/nsswitch.conf etc/rpc usr/lib/gconv/gconv-modules"
+SLX_INST_SOURCE_BASEURL_fedora6update='http://ftp.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.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.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.i686.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"
 SLX_INSTALL_FAKE_FILE="/etc/fstab"
-SLX_INSTALL_PACKAGES_MAIN="kernel bash"
+SLX_INSTALL_PACKAGES_MAIN=""
diff --git a/installer/systems/fedora6/settings.local.example b/installer/systems/fedora6/settings.local.example
index 58cb12d4..f43fd0a5 100644
--- a/installer/systems/fedora6/settings.local.example
+++ b/installer/systems/fedora6/settings.local.example
@@ -3,8 +3,8 @@
 # It's also possible to define addditional values here.
 
 # Use a local installation source.
-SLX_INST_SOURCE_BASEURL_fedora6="http://ftp-1.gwdg.de/pub/linux/fedora/linux/core/6/i386/os"
-#SLX_INST_SOURCE_BASEURL_fedora6update="http://ftp-1.gwdg.de/pub/linux/fedora/linux/core/updates/6"
+SLX_INST_SOURCE_BASEURL="http://ftp-1.gwdg.de/pub/linux/fedora/linux/core/6/i386/os"
+SLX_INST_SOURCE_BASEURL_fedora6update='http://ftp-1.gwdg.de/pub/linux/fedora/linux/core/updates/$releasever/$basearch/'
 
 # Add more packages.
 # It's possible to habe more than one SLX_INSTALL_PACKAGES_* variable defined.