[Debian-live-changes] r990 - dists/trunk/live-helper/functions

[Daniel Baumann]

Author: daniel
Date: 2007-04-09 15:43:40 +0000 (Mon, 09 Apr 2007)
New Revision: 990

Modified:
   dists/trunk/live-helper/functions/defaults.sh
Log:


Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh	2007-04-09 15:36:00 UTC (rev 989)
+++ dists/trunk/live-helper/functions/defaults.sh	2007-04-09 15:43:40 UTC (rev 990)
@@ -74,16 +74,36 @@
 	# Setting bootstrap program
 	if [ -z "${LH_BOOTSTRAP}" ] || [ ! -x "${LH_BOOTSTRAP}" ]
 	then
-		if [ -x "/usr/bin/cdebootstrap" ]
-		then
-			LH_BOOTSTRAP="cdebootstrap"
-		elif [ -x "/usr/sbin/debootstrap" ]
-		then
-			LH_BOOTSTRAP="debootstrap"
-		else
-			echo "E: Can't process file /usr/bin/cdebootstrap or /usr/sbin/debootstrap (FIXME)"
-			exit 1
-		fi
+		case "${LH_MODE}" in
+			debian)
+				if [ -x "/usr/bin/cdebootstrap" ]
+				then
+					LH_BOOTSTRAP="cdebootstrap"
+				elif [ -x "/usr/sbin/debootstrap" ]
+				then
+					LH_BOOTSTRAP="debootstrap"
+				else
+					echo "E: Can't process file /usr/bin/cdebootstrap or /usr/sbin/debootstrap (FIXME)"
+					exit 1
+				fi
+			;;
+
+			ubuntu)
+				if [ -x "/usr/sbin/debootstrap" ]
+				then
+					if [ -f /usr/lib/debootstrap/scripts/feisty ]
+					then
+						LH_BOOTSTRAP="debootstrap"
+					else
+						echo "E: Your version of debootstrap does not support ubuntu."
+						exit 1
+					fi
+				else
+					echo "E: You need to install debootstrap from Ubuntu in order to bootstrap ubuntu."
+					exit 1
+				fi
+				;;
+		esac
 	fi
 
 	# Setting cache option