Add native Debian systems (sarge and etch) to the bootstrapable systems.

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

5 files changed, 35 insertions, 7 deletions

diff --git a/installer/slxossetup b/installer/slxossetup
index b5c40e3b..e9ce2d91 100755
--- a/installer/slxossetup
+++ b/installer/slxossetup
@@ -194,7 +194,7 @@ function setup_bootstrap_1c()
 	local dir file packagelist packagekey rc
 
 	case "${SLX_SYSTEM_BASENAME}" in
-		*ubuntu*)
+		*debian*|*ubuntu**)
 			test -d "${SLX_STAGE1_FINAL_PATH}" || \
 				mkdir -p "${SLX_STAGE1_FINAL_PATH}"
 
@@ -246,7 +246,7 @@ function setup_bootstrap_1c()
 function setup_package_sources()
 {
 	case "${SLX_SYSTEM_BASENAME}" in
-		*ubuntu*)
+		*debian*|*ubuntu**)
 			SOURCES_LIST="${SLX_STAGE1_PATH}/etc/apt/sources.list"
 			rm -f "${SOURCES_LIST}"
 		;;
@@ -293,7 +293,7 @@ function setup_package_sources()
 		echo "$0: Adding installation source name=\"${INST_SOURCE_NAME}\", baseurl=\"${INST_SOURCE_BASEURL}${INST_SOURCE_REPO_SUBDIR:+/${INST_SOURCE_REPO_SUBDIR}}\". "
 
 		case "${META_PACKAGER}" in
-			*ubuntu*)
+			*debian*|*ubuntu**)
 				echo "deb ${INST_SOURCE_BASEURL} ${INST_SOURCE_DISTRIBUTION} ${INST_SOURCE_COMPONENTS}" \
 					>>${SOURCES_LIST}
 				# FIXME Add feature to sort the lines by given (?) priority.
@@ -330,7 +330,7 @@ function update_system()
 	fi
 
 	case "${META_PACKAGER}" in
-		*ubuntu*)
+		*debian*|*ubuntu**)
 			: ${SLX_STAGE1_UPDATE_OPTIONS:=-y}
 			: ${SLX_STAGE1_UPGRADE_OPTIONS:=-y}
 			chroot "${SLX_STAGE1_PATH}" apt-get update ${SLX_STAGE1_UPDATE_OPTIONS}
@@ -365,7 +365,7 @@ function install_slxselection()
 		return
 	
 	case "${META_PACKAGER}" in
-		*ubuntu*)
+		*debian*|*ubuntu**)
 			: ${SLX_STAGE1_INSTALL_OPTIONS:=-y}
 			chroot "${SLX_STAGE1_PATH}" apt-get install ${SLX_STAGE1_INSTALL_OPTIONS} ${packagelist}
 		;;
@@ -428,7 +428,7 @@ function slxossetup()
 			REPO_TYPE="rpm-md"
 			NAME_DEST_ROOT="rpm-root"
 			;;
-		*ubuntu*)
+		*debian*|*ubuntu**)
 			GLOBAL_SETTINGS="BASEURL COMPONENTS DISTRIBUTION"
 			REPO_TYPE="apt-deb"
 			NAME_DEST_ROOT="deb-root"
@@ -436,7 +436,7 @@ function slxossetup()
 			SLX_STAGE1_CREATE_FILE="/var/lib/dpkg/available /var/lib/dpkg/status"
 			X86_ARCH='i386'
 			;;
-		*) echo "$0: Error, unkown system ${SLX_SYSTEM_BASENAME}" ;;
+		*) ErrorMsg 1 "Unkown system ${SLX_SYSTEM_BASENAME}. " ;;
 	esac
 
 	if test -z "${SLX_INST_ARCH}"; then
diff --git a/installer/systems/debian31/settings b/installer/systems/debian31/settings
new file mode 100644
index 00000000..38c0fe44
--- /dev/null
+++ b/installer/systems/debian31/settings
@@ -0,0 +1,8 @@
+SLX_INST_SOURCE_BASEURL="http://ftp-1.gwdg.de/pub/linux/debian/debian"
+SLX_INST_SOURCE_COMPONENTS="contrib main non-free"
+SLX_INST_SOURCE_DISTRIBUTION="sarge"
+SLX_INST_SOURCE_NAME_sarge31="Debian 3.1"
+SLX_INST_SOURCE_BASEURL_sarge31security="http://ftp-1.gwdg.de/pub/linux/debian/debian-security"
+SLX_INST_SOURCE_NAME_sarge31security="Debian 3.1 security"
+SLX_INST_SOURCE_DISTRIBUTION_sarge31security="sarge/updates"
+SLX_BASE_PREREQ_PACKAGES="pool/main/d/debootstrap/debootstrap_0.3.3.1_all.deb"
diff --git a/installer/systems/debian31/settings.local.example b/installer/systems/debian31/settings.local.example
new file mode 100644
index 00000000..46679094
--- /dev/null
+++ b/installer/systems/debian31/settings.local.example
@@ -0,0 +1,6 @@
+SLX_INST_SOURCE_BASEURL="ftp://gab/pub/debian"
+SLX_INST_SOURCE_COMPONENTS_sarge31dvd="main restricted"
+SLX_INST_SOURCE_NAME_sarge31dvd="Debian 3.1 DVD"
+SLX_INST_SOURCE_PRIORITY_sarge31dvd="10"
+SLX_INST_SOURCE_BASEURL_sarge31="http://ftp-1.gwdg.de/pub/linux/debian/debian"
+SLX_INST_SOURCE_BASEURL_sarge31security="http://ftp-1.gwdg.de/pub/linux/debian/debian"
diff --git a/installer/systems/debian40/settings b/installer/systems/debian40/settings
new file mode 100644
index 00000000..c7ab47a6
--- /dev/null
+++ b/installer/systems/debian40/settings
@@ -0,0 +1,8 @@
+SLX_INST_SOURCE_BASEURL="http://ftp-1.gwdg.de/pub/linux/debian/debian"
+SLX_INST_SOURCE_COMPONENTS="contrib main non-free"
+SLX_INST_SOURCE_DISTRIBUTION="etch"
+SLX_INST_SOURCE_NAME_etch40="Debian 4.0"
+SLX_INST_SOURCE_BASEURL_etch40security="http://ftp-1.gwdg.de/pub/linux/debian/debian-security"
+SLX_INST_SOURCE_NAME_etch40security="Debian 4.0 security"
+SLX_INST_SOURCE_DISTRIBUTION_etch40security="etch/updates"
+SLX_BASE_PREREQ_PACKAGES="pool/main/d/debootstrap/debootstrap_0.3.3.1_all.deb"
diff --git a/installer/systems/debian40/settings.local.example b/installer/systems/debian40/settings.local.example
new file mode 100644
index 00000000..839d2659
--- /dev/null
+++ b/installer/systems/debian40/settings.local.example
@@ -0,0 +1,6 @@
+SLX_INST_SOURCE_BASEURL="ftp://gab/pub/debian"
+SLX_INST_SOURCE_COMPONENTS_etch40dvd="main restricted"
+SLX_INST_SOURCE_NAME_etch40dvd="Debian 3.1 DVD"
+SLX_INST_SOURCE_PRIORITY_etch40dvd="10"
+SLX_INST_SOURCE_BASEURL_etch40="http://ftp-1.gwdg.de/pub/linux/debian/debian"
+SLX_INST_SOURCE_BASEURL_etch40security="http://ftp-1.gwdg.de/pub/linux/debian/debian"