r2805 - in dists/trunk/live-helper: debian docs functions

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-08-28 18:48:41 +0000 (Tue, 28 Aug 2007)
New Revision: 2805

Modified:
   dists/trunk/live-helper/debian/control
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/functions/defaults.sh
Log:


Modified: dists/trunk/live-helper/debian/control
===================================================================
--- dists/trunk/live-helper/debian/control	2007-08-28 18:44:30 UTC (rev 2804)
+++ dists/trunk/live-helper/debian/control	2007-08-28 18:48:41 UTC (rev 2805)
@@ -10,7 +10,7 @@
 
 Package: live-helper
 Architecture: all
-Depends: cdebootstrap | debootstrap
+Depends: debootstrap | cdebootstrap
 Suggests: dosfstools, genisoimage | mkisofs, memtest86+ | memtest86, mtools, parted, squashfs-tools | genext2fs, syslinux | grub
 Description: Debian Live helper programs
  Live-helper is a collection of programs that can be used to build Debian Live

Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-08-28 18:44:30 UTC (rev 2804)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-08-28 18:48:41 UTC (rev 2805)
@@ -1,5 +1,7 @@
 2007-08-28  Daniel Baumann  <daniel at debian.org>
 
+	* functions/defaults.sh:
+	  - Prefering debootstrap over cdebootstrap.
 	* helpers/lh_chroot_local-packages:
 	  - Only copy packages matching the build-architecture. This way, you
 	    can store local packages for different architectures in the very

Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh	2007-08-28 18:44:30 UTC (rev 2804)
+++ dists/trunk/live-helper/functions/defaults.sh	2007-08-28 18:48:41 UTC (rev 2805)
@@ -102,12 +102,12 @@
 	then
 		case "${LH_MODE}" in
 			debian|debian-edu)
-				if [ -x "/usr/bin/cdebootstrap" ]
+				if [ -x "/usr/sbin/debootstrap" ]
 				then
+					LH_BOOTSTRAP="debootstrap"
+				elif [ -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
@@ -115,12 +115,12 @@
 			;;
 
 			ubuntu)
-				if [ -x "/usr/bin/cdebootstrap" ] && [ -d /usr/share/cdebootstrap/generic-ubuntu ]
+				if [ -x "/usr/sbin/debootstrap" ] && [ -f /usr/lib/debootstrap/scripts/gutsy ]
 				then
+					LH_BOOTSTRAP="debootstrap"
+				elif [ -x "/usr/bin/cdebootstrap" ] && [ -d /usr/share/cdebootstrap/generic-ubuntu ]
+				then
 					LH_BOOTSTRAP="cdebootstrap"
-				elif [ -x "/usr/sbin/debootstrap" ] && [ -f /usr/lib/debootstrap/scripts/gutsy ]
-				then
-					LH_BOOTSTRAP="debootstrap"
 				else
 					echo "E: Your version of debootstrap or cdebootstrap is outdated and does not support ubuntu."
 					exit 1