From ccf8d6114d76c825f82b4a4fd69ec1731a3db608 Mon Sep 17 00:00:00 2001
From: Lars Müller
Date: Mon, 18 Dec 2006 10:08:05 +0000
Subject: Allow install_prereq_packages to handle debs.

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@567 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 installer/slxossetup | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/installer/slxossetup b/installer/slxossetup
index 0a771a36..c759c01f 100755
--- a/installer/slxossetup
+++ b/installer/slxossetup
@@ -90,9 +90,19 @@ function install_prereq_packages()
 	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
+	for package in ${SLX_PACKAGE_DOWNLOAD_PATH}/${SLX_BASE_PREREQ_PACKAGES}*; do
+		case "${package}" in
+		*.rpm)
+			rpm2cpio "${package}" | \
+				cpio -i --make-directories
+			;;
+		*.deb)
+			dpkg --root="${SLX_STAGE1_PATH}" --unpack "${package}"
+			;;
+		*)
+			echo "$0: Warning, unknown package type of ${package}. "
+			;;
+		esac
 	done
 
 	# Move package from temp to package dir.
-- 
cgit v1.2.3-55-g7522