From df1cea54c56ecd4ea99e2d9d5d3cb3ce075b150a Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Mon, 27 Aug 2012 14:26:08 +0200
Subject: Removing bootstrap-flavour option (Closes: #685675).

live-build does too much magic that causes too much effort in
maintaining for stuff that hardly everyone uses.

Rather than 'translating' back and forth and maintaining compatibility
between options of different debootstrap and cdebootstrap versions (and
possibly any other in the future), it's is better to 'off-load' this to
the user.

For non-live specific options passed to the bootstrap tools, we'll
be introducing --debootstrap-options and --cdebootstrap-options
where users can specify their additional options passed to the
respective bootstrap tool, rather than us maintaining them in a
'hardcoded' and selected list.
---
 templates/cgi/debian/build.html | 1 -
 templates/cgi/debian/form.html  | 9 ---------
 2 files changed, 10 deletions(-)

(limited to 'templates')

diff --git a/templates/cgi/debian/build.html b/templates/cgi/debian/build.html
index 01de1ae1e..166ac3301 100644
--- a/templates/cgi/debian/build.html
+++ b/templates/cgi/debian/build.html
@@ -22,7 +22,6 @@
 
 <table>
 	<tr><td>--architectures: </td><td>LB_ARCHITECTURES</td></tr>
-	<tr><td>--bootstrap-flavour: </td><td>LB_BOOTSTRAP_FLAVOUR</td></tr>
 	<tr><td>--archive-areas: </td><td>LB_ARCHIVE_AREAS</td></tr>
 </table>
 
diff --git a/templates/cgi/debian/form.html b/templates/cgi/debian/form.html
index 9912f4e52..5cf1cb8c2 100644
--- a/templates/cgi/debian/form.html
+++ b/templates/cgi/debian/form.html
@@ -82,15 +82,6 @@
 		</tr>
 		<!-- LIVE_DISTRIBUTION -->
 		<!-- LIVE_DISTRIBUTION_CONFIG -->
-		<tr>
-			<td><label for="Bootstrap_Flavour">--bootstrap-flavour:</label> </td>
-			<td>
-				<select id="Bootstrap_Flavour" name="bootstrap_flavour" size="1">
-					<option value="minimal">minimal</option>
-					<option selected value="standard">standard</option>
-				</select>
-			</td>
-		</tr>
 		<tr>
 			<td><label for="Archive_Areas">--archive-areas:</label> </td>
 			<td><input id="Archive_Areas" name="archive_areas" maxlength="128" size="50" type="text" value="main" readonly /></td>
-- 
cgit v1.2.3