Add a default repo type in slxossetup and remove any repo type which is

identical to the default from the settings files.


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

6 files changed, 6 insertions, 6 deletions

diff --git a/installer/slxossetup b/installer/slxossetup
index c74033b5..82c6b9d8 100755
--- a/installer/slxossetup
+++ b/installer/slxossetup
@@ -62,7 +62,11 @@ function slxossetup_rpm()
 		SMART_CHANNEL="${variable##*_}"
 		SMART_BASEURL=$( eval echo \$$variable)
 		SMART_NAME=$( eval echo \$SLX_INST_SOURCE_NAME_${SMART_CHANNEL})
+		test "${SMART_NAME}" || \
+			SMART_NAME="${SMART_CHANNEL}"
 		SMART_TYPE=$( eval echo \$SLX_INST_SOURCE_TYPE_${SMART_CHANNEL})
+		test "${SMART_TYPE}" || \
+			SMART_TYPE="${REPO_TYPE}"
 		PACKAGEKEYS=$( eval echo \$SLX_INST_SOURCE_PACKAGEKEYS_${SMART_CHANNEL})
 
 		smart --data-dir="${SLX_METADATA_PATH}" \
@@ -182,9 +186,11 @@ function slxossetup()
 		*suse*)
 			# Inform SUSE RPMs that we're performing an installation
 			export YAST_IS_RUNNING="instsys"
+			REPO_TYPE="rpm-md"
 			slxossetup_rpm
 			;;
 		*fedora*)
+			REPO_TYPE="rpm-md"
 			slxossetup_rpm
 			;;
 		*) echo "$0: Error, unkown system ${SLX_SYSTEM_BASENAME}" ;;
diff --git a/installer/systems/fedora6/settings b/installer/systems/fedora6/settings
index c0c574b6..08617d4a 100644
--- a/installer/systems/fedora6/settings
+++ b/installer/systems/fedora6/settings
@@ -10,10 +10,8 @@ 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_BIND_MOUNT="sys"
diff --git a/installer/systems/opensuse102/settings b/installer/systems/opensuse102/settings
index f15bf737..6e07b1de 100644
--- a/installer/systems/opensuse102/settings
+++ b/installer/systems/opensuse102/settings
@@ -11,7 +11,6 @@ SLX_INST_SOURCE_NAME_opensuse102="openSUSE 10.2"
 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_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 9271256b..34981c20 100644
--- a/installer/systems/suse100/settings
+++ b/installer/systems/suse100/settings
@@ -9,7 +9,6 @@ SLX_INST_SOURCE_NAME_suse100="SUSE Linux 10.0"
 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_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 6fe03e0f..375a69b1 100644
--- a/installer/systems/suse101/settings
+++ b/installer/systems/suse101/settings
@@ -10,7 +10,6 @@ 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_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 ad60da1b..1fe2ccd4 100644
--- a/installer/systems/suse93/settings
+++ b/installer/systems/suse93/settings
@@ -8,7 +8,6 @@ SLX_INST_SOURCE_NAME_suse93="SUSE Linux 9.3"
 SLX_INST_SOURCE_TYPE_suse93="yast2"
 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"