Support Fedora 6.

Add SLX_BASE_PREREQ_CLEANUP_PATH to control which pathes are cleaned up
after the prerequired packages are unpacked.

Ensure we have to download any prerequired package else skip this part.


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

7 files changed, 86 insertions, 37 deletions

diff --git a/installer/slxossetup b/installer/slxossetup
index 972609ba..c422c197 100755
--- a/installer/slxossetup
+++ b/installer/slxossetup
@@ -86,48 +86,57 @@ function slxossetup_rpm()
 	smart --data-dir="${SLX_METADATA_PATH}" \
 		update
 
-	# Download and unpack prerequired packages before any package installation
-	SLX_PACKAGE_PATH="${SLX_METADATA_PATH}/packages"
-	TMP_DIR=$( mktemp -d "${SLX_METADATA_PATH}/packages.XXXXXXXX")
-	if test $? -ne 0; then
-		echo "$0: Warning, can not create temp package download directory! "
-		echo "    Using ${SLX_PACKAGE_DOWNLOAD_PATH} instead. "
-		SLX_PACKAGE_DOWNLOAD_PATH="${SLX_PACKAGE_PATH}"
-	else
-		SLX_PACKAGE_DOWNLOAD_PATH="${TMP_DIR}"
-	fi
-	test -d "${SLX_PACKAGE_DOWNLOAD_PATH}" || \
-		mkdir -p "${SLX_PACKAGE_DOWNLOAD_PATH}"
-	pushd "${SLX_PACKAGE_DOWNLOAD_PATH}" >/dev/null
-	smart --data-dir="${SLX_METADATA_PATH}" \
-		download \
-		"${SLX_BASE_PREREQ_PACKAGES}"
-	popd >/dev/null
-
-	test -d "${SLX_STAGE1_PATH}" || \
-		mkdir -p "${SLX_STAGE1_PATH}"
-	pushd "${SLX_STAGE1_PATH}" >/dev/null
-	for package in $SLX_BASE_PREREQ_PACKAGES; do
-		rpm2cpio ${SLX_PACKAGE_DOWNLOAD_PATH}/${package}-*.rpm | \
-			cpio -i --make-directories
-	done
+	if test "${SLX_BASE_PREREQ_PACKAGES}"; then
+		# Download and unpack prerequired packages before any package installation
+		SLX_PACKAGE_PATH="${SLX_METADATA_PATH}/packages"
+		TMP_DIR=$( mktemp -d "${SLX_METADATA_PATH}/packages.XXXXXXXX")
+		if test $? -ne 0; then
+			echo "$0: Warning, can not create temp package download directory! "
+			echo "    Using ${SLX_PACKAGE_DOWNLOAD_PATH} instead. "
+			SLX_PACKAGE_DOWNLOAD_PATH="${SLX_PACKAGE_PATH}"
+		else
+			SLX_PACKAGE_DOWNLOAD_PATH="${TMP_DIR}"
+		fi
+		test -d "${SLX_PACKAGE_DOWNLOAD_PATH}" || \
+			mkdir -p "${SLX_PACKAGE_DOWNLOAD_PATH}"
+		pushd "${SLX_PACKAGE_DOWNLOAD_PATH}" >/dev/null
+		smart --data-dir="${SLX_METADATA_PATH}" \
+			download \
+			"${SLX_BASE_PREREQ_PACKAGES}"
+		popd >/dev/null
+
+		test -d "${SLX_STAGE1_PATH}" || \
+			mkdir -p "${SLX_STAGE1_PATH}"
+		pushd "${SLX_STAGE1_PATH}" >/dev/null
+		for package in ${SLX_BASE_PREREQ_PACKAGES}; do
+			rpm2cpio ${SLX_PACKAGE_DOWNLOAD_PATH}/${package}-*.rpm | \
+				cpio -i --make-directories
+		done
 
-	# Move package from temp to package dir.
-	if test "${SLX_PACKAGE_DOWNLOAD_PATH}" != "${SLX_PACKAGE_PATH}"; then
-		test -d "${SLX_PACKAGE_PATH}" || \
-			mkdir -p "${SLX_PACKAGE_PATH}"
-		mv "${SLX_PACKAGE_DOWNLOAD_PATH}/"*.rpm "${SLX_PACKAGE_PATH}/"
-		rmdir "${SLX_PACKAGE_DOWNLOAD_PATH}"
-	fi
+		# Move package from temp to package dir.
+		if test "${SLX_PACKAGE_DOWNLOAD_PATH}" != "${SLX_PACKAGE_PATH}"; then
+			test -d "${SLX_PACKAGE_PATH}" || \
+				mkdir -p "${SLX_PACKAGE_PATH}"
+			mv "${SLX_PACKAGE_DOWNLOAD_PATH}/"*.rpm "${SLX_PACKAGE_PATH}/"
+			rmdir "${SLX_PACKAGE_DOWNLOAD_PATH}"
+		fi
 
-	# Cleanup etc to prevent .rpnnew files
-   # FIXME: This should be controled by the config file.
-	find etc/ -type f -print0 | \
-		xargs -0 rm -f
-	popd >/dev/null
+		# Cleanup etc to prevent .rpnnew files
+		if test "${SLX_BASE_PREREQ_CLEANUP_PATH}"; then
+			for path in ${SLX_BASE_PREREQ_CLEANUP_PATH}; do
+				# Remove leading / as we do not like to delete e.g. /etc
+				path="${path#/}"
+				find "${path}" -type f -print0 | \
+					xargs -0 rm -f
+			done
+		fi
+		popd >/dev/null
+	fi
 
 	# Install base system files
 	for file in ${SLX_SYSTEM_CONFIG_PATH}/BASE_FILE_*; do
+		# We might not have any BASE_FILE_* at all.
+		test -f "${file}" || continue
 		suffix="${file#${SLX_SYSTEM_CONFIG_PATH}/BASE_FILE_}"
 		dest_path=${suffix%__*}
 		dest_path="${dest_path//__//}"
@@ -157,6 +166,9 @@ function slxossetup()
 			export YAST_IS_RUNNING="instsys"
 			slxossetup_rpm
 			;;
+		*fedora*)
+			slxossetup_rpm
+			;;
 		*) echo "$0: Error, unkown system ${SLX_SYSTEM_BASENAME}" ;;
 	esac
 }
diff --git a/installer/systems/fedora6/settings b/installer/systems/fedora6/settings
new file mode 100644
index 00000000..db5b01f7
--- /dev/null
+++ b/installer/systems/fedora6/settings
@@ -0,0 +1,19 @@
+SLX_INST_SOURCE_BASEURL_fedora6="http://ftp.gwdg.de/pub/linux/fedora/linux/core/6/i386/os"
+SLX_INST_SOURCE_PACKAGEKEYS_fedora6="
+RPM-GPG-KEY
+RPM-GPG-KEY-beta
+RPM-GPG-KEY-fedora
+RPM-GPG-KEY-fedora-extras
+RPM-GPG-KEY-fedora-legacy
+RPM-GPG-KEY-fedora-rawhide
+RPM-GPG-KEY-fedora-test
+RPM-GPG-KEY-rawhide
+"
+SLX_INST_SOURCE_NAME_fedora6="Fedora 6"
+SLX_INST_SOURCE_TYPE_fedora6="rpm-md"
+#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_INST_SOURCE_TYPE_fedora6update="rpm-md"
+SLX_BASE_PREREQ_PACKAGES="glibc"
+SLX_BASE_PREREQ_CLEANUP_PATH="etc/localtime etc/nsswitch.conf etc/rpc usr/lib/gconv/gconv-modules"
+SLX_INSTALL_PACKAGES_MAIN="kernel bash"
diff --git a/installer/systems/fedora6/settings.local b/installer/systems/fedora6/settings.local
new file mode 100644
index 00000000..58cb12d4
--- /dev/null
+++ b/installer/systems/fedora6/settings.local
@@ -0,0 +1,14 @@
+# Settings made here overwrite values from the settings file in the same
+# directory.
+# 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"
+
+# Add more packages.
+# It's possible to habe more than one SLX_INSTALL_PACKAGES_* variable defined.
+# All SLX_INSTALL_PACKAGES_* are combined to one package list which is
+# in one step.
+SLX_INSTALL_PACKAGES_EDITORS="vim-enhanced emacs"
+SLX_INSTALL_PACKAGES_KDEPIM="kdepim"
diff --git a/installer/systems/opensuse102/settings b/installer/systems/opensuse102/settings
index 4b899014..f15bf737 100644
--- a/installer/systems/opensuse102/settings
+++ b/installer/systems/opensuse102/settings
@@ -13,4 +13,5 @@ SLX_INST_SOURCE_BASEURL_opensuse102update="http://ftp.gwdg.de/pub/suse/update/10
 SLX_INST_SOURCE_NAME_opensuse102update="openSUSE 10.2 updates"
 SLX_INST_SOURCE_TYPE_opensuse102update="rpm-md"
 SLX_BASE_PREREQ_PACKAGES="glibc"
+SLX_BASE_PREREQ_CLEANUP_PATH="etc"
 SLX_INSTALL_PACKAGES_MAIN="kernel-default bash"
diff --git a/installer/systems/suse100/settings b/installer/systems/suse100/settings
index ca2af813..9271256b 100644
--- a/installer/systems/suse100/settings
+++ b/installer/systems/suse100/settings
@@ -11,4 +11,5 @@ 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_INST_SOURCE_TYPE_suse100update="rpm-md"
 SLX_BASE_PREREQ_PACKAGES="glibc"
+SLX_BASE_PREREQ_CLEANUP_PATH="etc"
 SLX_INSTALL_PACKAGES_MAIN="kernel-default bash"
diff --git a/installer/systems/suse101/settings b/installer/systems/suse101/settings
index 2387d8cd..6fe03e0f 100644
--- a/installer/systems/suse101/settings
+++ b/installer/systems/suse101/settings
@@ -12,4 +12,5 @@ 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_INST_SOURCE_TYPE_suse101update="rpm-md"
 SLX_BASE_PREREQ_PACKAGES="glibc"
+SLX_BASE_PREREQ_CLEANUP_PATH="etc"
 SLX_INSTALL_PACKAGES_MAIN="kernel-default bash"
diff --git a/installer/systems/suse93/settings b/installer/systems/suse93/settings
index 4d79f67b..ad60da1b 100644
--- a/installer/systems/suse93/settings
+++ b/installer/systems/suse93/settings
@@ -10,4 +10,5 @@ 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_INST_SOURCE_TYPE_suse93update="rpm-md"
 SLX_BASE_PREREQ_PACKAGES="glibc"
+SLX_BASE_PREREQ_CLEANUP_PATH="etc"
 SLX_INSTALL_PACKAGES_MAIN="kernel-default bash"