[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#685675: live-build: minimal and standard are not valid debootstrap variants



Package: live-build
Version: 3.0~a57-1
Severity: normal
Tags: patch
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch quantal

As of commit 81fb4294538a7204232d3e76195a778df0ee3ee1, lb config
--bootstrap-flavour=minimal causes debootstrap to be invoked with
--variant=minimal, which produces "E: unsupported variant".  This should
be --variant=minbase instead.

Index: b/scripts/build/lb_bootstrap_debootstrap
===================================================================
--- a/scripts/build/lb_bootstrap_debootstrap
+++ b/scripts/build/lb_bootstrap_debootstrap
@@ -84,7 +84,18 @@
 	false)
 		if [ -n "${LB_BOOTSTRAP_FLAVOUR}" ]
 		then
-			DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=${LB_BOOTSTRAP_FLAVOUR}"
+			case "${LB_BOOTSTRAP_FLAVOUR}" in
+				minimal)
+					DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=minbase"
+					;;
+
+				standard)
+					;;
+
+				*)
+					DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=${LB_BOOTSTRAP_FLAVOUR}"
+					;;
+			esac
 		fi
 		;;
 esac

Thanks,

-- 
Colin Watson                                       [cjwatson@ubuntu.com]


Reply to: