summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xfunctions/defaults.sh2
-rw-r--r--manpages/en/lb.12
-rw-r--r--manpages/en/lb_binary.12
-rw-r--r--manpages/en/lb_bootstrap.12
-rw-r--r--manpages/en/lb_build.12
-rw-r--r--manpages/en/lb_chroot.12
-rw-r--r--manpages/en/lb_clean.12
-rw-r--r--manpages/en/lb_config.18
-rw-r--r--manpages/en/lb_source.12
-rw-r--r--manpages/en/lb_testroot.12
-rw-r--r--manpages/en/live-build.72
-rw-r--r--manpages/pot/lb.1.pot4
-rw-r--r--manpages/pot/lb_binary.1.pot4
-rw-r--r--manpages/pot/lb_bootstrap.1.pot4
-rw-r--r--manpages/pot/lb_build.1.pot4
-rw-r--r--manpages/pot/lb_chroot.1.pot4
-rw-r--r--manpages/pot/lb_clean.1.pot4
-rw-r--r--manpages/pot/lb_config.1.pot10
-rw-r--r--manpages/pot/lb_source.1.pot4
-rw-r--r--manpages/pot/lb_testroot.1.pot4
-rw-r--r--manpages/pot/live-build.7.pot4
-rwxr-xr-xscripts/build/config2
22 files changed, 38 insertions, 38 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 3dac1d51e..28b8d6cdc 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -849,7 +849,7 @@ Set_defaults ()
# Setting apt indices
case "${LB_MODE}" in
progress-linux)
- LB_APT_INDICES="${LB_APT_INDICES:-none}"
+ LB_APT_INDICES="${LB_APT_INDICES:-false}"
;;
*)
diff --git a/manpages/en/lb.1 b/manpages/en/lb.1
index 75cbc7654..a8f7fad66 100644
--- a/manpages/en/lb.1
+++ b/manpages/en/lb.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2013\-02\-14 3.0.1-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2013\-04\-09 3.0.1-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 878783ef7..aafac7e56 100644
--- a/manpages/en/lb_binary.1
+++ b/manpages/en/lb_binary.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2013\-02\-14 3.0.1-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2013\-04\-09 3.0.1-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 67f0f5ea6..6b6111a3c 100644
--- a/manpages/en/lb_bootstrap.1
+++ b/manpages/en/lb_bootstrap.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2013\-02\-14 3.0.1-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2013\-04\-09 3.0.1-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 037ec9b31..8e6d04554 100644
--- a/manpages/en/lb_build.1
+++ b/manpages/en/lb_build.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2013\-02\-14 3.0.1-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2013\-04\-09 3.0.1-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 1d2c357d6..a31600d92 100644
--- a/manpages/en/lb_chroot.1
+++ b/manpages/en/lb_chroot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2013\-02\-14 3.0.1-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2013\-04\-09 3.0.1-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 eda4c497d..58945b20e 100644
--- a/manpages/en/lb_clean.1
+++ b/manpages/en/lb_clean.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2013\-02\-14 3.0.1-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2013\-04\-09 3.0.1-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 7302dc01d..9eb5e60cf 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2013\-02\-14 3.0.1-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2013\-04\-09 3.0.1-1 "Debian Live Project"
.SH NAME
\fBlb config\fR \- Create config directory
@@ -15,7 +15,7 @@
.br
[\fB\-\-apt\-http\-proxy\fR \fIURL\fR]
.br
- [\fB\-\-apt\-indices\fR true|false|none]
+ [\fB\-\-apt\-indices\fR true|false]
.br
[\fB\-\-apt\-options\fR \fIOPTION\fR|"\fIOPTIONS\fR"]
.br
@@ -249,8 +249,8 @@ defines if apt\-get or aptitude is used to install packages when building the im
sets the ftp proxy to be used by apt. By default, this is empty. Note that this variable is only for the proxy that gets used by apt internally within the chroot, it is not used for anything else.
.IP "\fB\-\-apt\-http\-proxy\fR \fIURL\fR" 4
sets the http proxy to be used by apt. By default, this is empty. Note that this variable is only for the proxy that gets used by apt internally within the chroot, it is not used for anything else.
-.IP "\fB\-\-apt\-indices\fR true|false|none" 4
-defines if the resulting images should have apt indices or not and defaults to true. If set to none, no indices are included at all.
+.IP "\fB\-\-apt\-indices\fR true|false" 4
+defines if the resulting images should have apt indices or not and defaults to true.
.IP "\fB\-\-apt\-options\fR \fIOPTION\fR|""\fIOPTIONS\fR""" 4
defines the default options that will be appended to every apt call that is made inside chroot during the building of the image. By default, this is set to \-\-yes to allow non-interactive installation of packages.
.IP "\fB\-\-aptitude\-options\fR \fIOPTION\fR|""\fIOPTIONS\fR""" 4
diff --git a/manpages/en/lb_source.1 b/manpages/en/lb_source.1
index e6fa7eebd..338a32c5d 100644
--- a/manpages/en/lb_source.1
+++ b/manpages/en/lb_source.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2013\-02\-14 3.0.1-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2013\-04\-09 3.0.1-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 fc83522ed..33243e027 100644
--- a/manpages/en/lb_testroot.1
+++ b/manpages/en/lb_testroot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2013\-02\-14 3.0.1-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2013\-04\-09 3.0.1-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 c297638c6..b21a61452 100644
--- a/manpages/en/live-build.7
+++ b/manpages/en/live-build.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 7 2013\-02\-14 3.0.1-1 "Debian Live Project"
+.TH LIVE\-BUILD 7 2013\-04\-09 3.0.1-1 "Debian Live Project"
.SH NAME
\fBlive\-build\fR \- the Debian Live tool suite
diff --git a/manpages/pot/lb.1.pot b/manpages/pot/lb.1.pot
index 7c77d1de5..ce2107db1 100644
--- a/manpages/pot/lb.1.pot
+++ b/manpages/pot/lb.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-02-14 19:31+0100\n"
+"POT-Creation-Date: 2013-04-09 05:31+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2013-02-14"
+msgid "2013-04-09"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_binary.1.pot b/manpages/pot/lb_binary.1.pot
index 87670a9b2..41f7764f7 100644
--- a/manpages/pot/lb_binary.1.pot
+++ b/manpages/pot/lb_binary.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-02-14 19:31+0100\n"
+"POT-Creation-Date: 2013-04-09 05:31+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2013-02-14"
+msgid "2013-04-09"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_bootstrap.1.pot b/manpages/pot/lb_bootstrap.1.pot
index 62a1edcfe..a872b2f62 100644
--- a/manpages/pot/lb_bootstrap.1.pot
+++ b/manpages/pot/lb_bootstrap.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-02-14 19:31+0100\n"
+"POT-Creation-Date: 2013-04-09 05:31+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2013-02-14"
+msgid "2013-04-09"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_build.1.pot b/manpages/pot/lb_build.1.pot
index c9c785a63..395a49e27 100644
--- a/manpages/pot/lb_build.1.pot
+++ b/manpages/pot/lb_build.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-02-14 19:31+0100\n"
+"POT-Creation-Date: 2013-04-09 05:31+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2013-02-14"
+msgid "2013-04-09"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_chroot.1.pot b/manpages/pot/lb_chroot.1.pot
index ec5666328..50e7a73be 100644
--- a/manpages/pot/lb_chroot.1.pot
+++ b/manpages/pot/lb_chroot.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-02-14 19:31+0100\n"
+"POT-Creation-Date: 2013-04-09 05:31+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2013-02-14"
+msgid "2013-04-09"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_clean.1.pot b/manpages/pot/lb_clean.1.pot
index a4f0d202a..1e8a640d4 100644
--- a/manpages/pot/lb_clean.1.pot
+++ b/manpages/pot/lb_clean.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-02-14 19:31+0100\n"
+"POT-Creation-Date: 2013-04-09 05:31+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2013-02-14"
+msgid "2013-04-09"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot
index 22fb51f5a..615111743 100644
--- a/manpages/pot/lb_config.1.pot
+++ b/manpages/pot/lb_config.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-02-14 19:31+0100\n"
+"POT-Creation-Date: 2013-04-09 05:31+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2013-02-14"
+msgid "2013-04-09"
msgstr ""
#. type: TH
@@ -197,7 +197,7 @@ msgstr ""
#. type: Plain text
#: en/lb_config.1:19
-msgid " [B<--apt-indices> true|false|none]"
+msgid " [B<--apt-indices> true|false]"
msgstr ""
#. type: Plain text
@@ -820,14 +820,14 @@ msgstr ""
#. type: IP
#: en/lb_config.1:252
#, no-wrap
-msgid "B<--apt-indices> true|false|none"
+msgid "B<--apt-indices> true|false"
msgstr ""
#. type: Plain text
#: en/lb_config.1:254
msgid ""
"defines if the resulting images should have apt indices or not and defaults "
-"to true. If set to none, no indices are included at all."
+"to true."
msgstr ""
#. type: IP
diff --git a/manpages/pot/lb_source.1.pot b/manpages/pot/lb_source.1.pot
index 9f2802edf..1c2d80d5e 100644
--- a/manpages/pot/lb_source.1.pot
+++ b/manpages/pot/lb_source.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-02-14 19:31+0100\n"
+"POT-Creation-Date: 2013-04-09 05:31+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2013-02-14"
+msgid "2013-04-09"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_testroot.1.pot b/manpages/pot/lb_testroot.1.pot
index 4ad2ad576..cd918bef5 100644
--- a/manpages/pot/lb_testroot.1.pot
+++ b/manpages/pot/lb_testroot.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-02-14 19:31+0100\n"
+"POT-Creation-Date: 2013-04-09 05:31+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2013-02-14"
+msgid "2013-04-09"
msgstr ""
#. type: TH
diff --git a/manpages/pot/live-build.7.pot b/manpages/pot/live-build.7.pot
index ca01a469e..e8775dbd8 100644
--- a/manpages/pot/live-build.7.pot
+++ b/manpages/pot/live-build.7.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-02-14 19:31+0100\n"
+"POT-Creation-Date: 2013-04-09 05:31+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2013-02-14"
+msgid "2013-04-09"
msgstr ""
#. type: TH
diff --git a/scripts/build/config b/scripts/build/config
index 91a433f6f..333b349b0 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -19,7 +19,7 @@ DESCRIPTION="$(Echo 'create configuration for live-build(7)')"
USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--apt-ftp-proxy URL]\n\
\t [--apt-http-proxy URL]\n\
-\t [--apt-indices true|false|none]\n\
+\t [--apt-indices true|false\n\
\t [--apt-options OPTION|\"OPTIONS\"]\n\
\t [--aptitude-options OPTION|\"OPTIONS\"]\n\
\t [--apt-pipeline DEPTH]\n\