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.

10 files changed, 10 insertions, 14 deletions

diff --git a/manpages/en/lb.1 b/manpages/en/lb.1
index b39e38f52..54bae1a5c 100644
--- a/manpages/en/lb.1
+++ b/manpages/en/lb.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a57-1 "Debian Live Project"
 
 .SH NAME
 \fBlb\fR \- wrapper for live\-build programs
diff --git a/manpages/en/lb_binary.1 b/manpages/en/lb_binary.1
index dfdef32cc..bb75376e5 100644
--- a/manpages/en/lb_binary.1
+++ b/manpages/en/lb_binary.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a57-1 "Debian Live Project"
 
 .SH NAME
 \fBlb binary\fR \- Complete the binary stage
diff --git a/manpages/en/lb_bootstrap.1 b/manpages/en/lb_bootstrap.1
index 2b2d0b41e..be27d8e0b 100644
--- a/manpages/en/lb_bootstrap.1
+++ b/manpages/en/lb_bootstrap.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a57-1 "Debian Live Project"
 
 .SH NAME
 \fBlb bootstrap\fR \- Complete the bootstrap stage
diff --git a/manpages/en/lb_build.1 b/manpages/en/lb_build.1
index 5e3cc5faf..58bda6296 100644
--- a/manpages/en/lb_build.1
+++ b/manpages/en/lb_build.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a57-1 "Debian Live Project"
 
 .SH NAME
 \fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages
diff --git a/manpages/en/lb_chroot.1 b/manpages/en/lb_chroot.1
index 03a958e9f..4460db4f8 100644
--- a/manpages/en/lb_chroot.1
+++ b/manpages/en/lb_chroot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a57-1 "Debian Live Project"
 
 .SH NAME
 \fBlb chroot\fR \- Complete the chroot stage
diff --git a/manpages/en/lb_clean.1 b/manpages/en/lb_clean.1
index 2795db57f..9b82b45b3 100644
--- a/manpages/en/lb_clean.1
+++ b/manpages/en/lb_clean.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a57-1 "Debian Live Project"
 
 .SH NAME
 \fBlb clean\fR \- Clean build directory
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index 18c776dfa..bf8611a06 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a57-1 "Debian Live Project"
 
 .SH NAME
 \fBlb config\fR \- Create config directory
@@ -43,8 +43,6 @@
 .br
 	[\fB\-\-bootstrap\fR cdebootstrap|cdebootstrap-static|debootstrap|copy]
 .br
-	[\-f|\fB\-\-bootstrap\-flavour\fR minimal|standard]
-.br
 	[\fB\-\-bootstrap\-keyring\fR \fIPACKAGE\fR]
 .br
 	[\fB\-\-cache\fR true|false]
@@ -287,8 +285,6 @@ sets boot parameters specific to debian\-live. A complete list of boot parameter
 defines which bootloader is beeing used in the generated image. This has only an effect if the selected binary image type does allow to choose the bootloader. For example, if you build a iso, always syslinux (or more precise, isolinux) is being used. Also note that some combinations of binary images types and bootloaders may be possible but live\-build does not support them yet. \fBlb config\fR will fail to create such a not yet supported configuration and give a explanation about it. For hdd images on amd64 and i386, the default is syslinux. yaboot is only used on powerpc.
 .IP "\fB\-\-bootstrap\fR cdebootstrap|cdebootstrap-static|debootstrap|copy" 4
 defines which program is used to bootstrap the debian chroot, default is debootstrap. Note that if you set the bootstrap program to copy, then your host system is copied. This can be useful if you want to convert/clone your existing host system into a live system, however, make sure you do have enough free space as this can, depending on your host system, get quite big.
-.IP "\-f|\fB\-\-bootstrap\-flavour\fR minimal|standard" 4
-defines if the bootstrap program should bootstrap the standard system (all packages of priority required and important, which is the default) or a minimal system (only packages of priority required, plus apt).
 .IP "\fB\-\-bootstrap\-keyring\fR \fIPACKAGE\fR" 4
 sets the archive keyring package to be used. Default is debian\-archive\-keyring.
 .IP "\fB\-\-cache\fR true|false" 4
diff --git a/manpages/en/lb_source.1 b/manpages/en/lb_source.1
index a0ccfdd95..f723ec5ed 100644
--- a/manpages/en/lb_source.1
+++ b/manpages/en/lb_source.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a57-1 "Debian Live Project"
 
 .SH NAME
 \fBlb source\fR \- Complete the source stage
diff --git a/manpages/en/lb_testroot.1 b/manpages/en/lb_testroot.1
index 89f55684c..998ff9722 100644
--- a/manpages/en/lb_testroot.1
+++ b/manpages/en/lb_testroot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a57-1 "Debian Live Project"
 
 .SH NAME
 \fBlb testroot\fR \- Ensure that a system is built as root
diff --git a/manpages/en/live-build.7 b/manpages/en/live-build.7
index 1d1214c10..72def7652 100644
--- a/manpages/en/live-build.7
+++ b/manpages/en/live-build.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 7 2012\-08\-14 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 7 2012\-08\-27 3.0~a57-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-build\fR \- the Debian Live tool suite