[SCM] live-build branch, upstream, updated. upstream/3.0_a57-1-g44c5b89
Daniel Baumann
daniel at debian.org
Mon Aug 27 14:36:18 UTC 2012
The following commit has been merged in the upstream branch:
commit 44c5b895f55f36007badaf61cbf7998c596ee0d6
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Aug 27 16:36:11 2012 +0200
Adding upstream version 3.0~a58.
diff --git a/VERSION b/VERSION
index 93a60ba..98fc7d9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a57-1
+3.0~a58-1
diff --git a/bin/lb b/bin/lb
index 5cffbaa..00868b5 100755
--- a/bin/lb
+++ b/bin/lb
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'utility to build Debian Live systems')"
@@ -40,7 +40,7 @@ case "${1}" in
;;
*)
- COMMAND="lb_${1}"
+ COMMAND="${1}"
shift
ENV=""
@@ -55,19 +55,26 @@ case "${1}" in
if [ -x "${LIVE_BUILD}/scripts/build/${COMMAND}" ]
then
+ # User has live-build copied locally in the system
SCRIPT="${LIVE_BUILD}/scripts/build/${COMMAND}"
+ elif [ -x "local/live-build/scripts/build/${COMMAND}" ]
+ then
+ # User has live-build embedded in the config
+ SCRIPT="local/live-build/scripts/build/${COMMAND}"
elif [ -x /usr/lib/live/build/${COMMAND} ]
then
+ # User has live-build installed in the system
SCRIPT=/usr/lib/live/build/"${COMMAND}"
elif [ -x "$(which ${COMMAND} 2>/dev/null)" ]
then
+ # User has live-build commands in path
SCRIPT="${COMMAND}"
else
Echo_error "no such script: ${COMMAND}"
exit 1
fi
- Echo "[%s] %s" "$(date +'%F %T')" "${COMMAND} ${*}"
- LB=1 ${ENV} exec "${SCRIPT}" "${@}"
+ Echo "[%s] %s" "$(date +'%F %T')" "lb ${COMMAND} $(echo ${@})"
+ ${ENV} exec "${SCRIPT}" "${@}"
;;
esac
diff --git a/bin/live-build b/bin/live-build
index 94a54c3..d7eb28f 100755
--- a/bin/live-build
+++ b/bin/live-build
@@ -23,7 +23,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
if [ -x "$(which man 2>/dev/null)" ]
then
diff --git a/frontends/cgi/live-build-cgi b/frontends/cgi/live-build-cgi
index 9925fe5..55ce083 100755
--- a/frontends/cgi/live-build-cgi
+++ b/frontends/cgi/live-build-cgi
@@ -9,7 +9,7 @@
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+. /usr/lib/live/build.sh
# Reading defaults
if [ -r /etc/default/live-build-cgi ]
@@ -73,7 +73,6 @@ else
# Advanced bootstrap options
LB_ARCHITECTURES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])architectures=[0-9a-z]+' | cut -f 2 -d '=' | head -n1)
- LB_BOOTSTRAP_FLAVOUR=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootstrap_flavour=[a-z]+' | cut -f 2 -d '=' | head -n1)
LB_ARCHIVE_AREAS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])archive_areas=[a-z]+' | cut -f 2 -d '=' | head -n1)
# Advanced chroot options
@@ -82,7 +81,7 @@ else
LB_SECURITY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])security=[a-z]+' | cut -f 2 -d '=' | head -n1)
# Advanced binary options
- LB_BINARY_INDICES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])binary_indices=[a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_APT_INDICES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])apt_indices=[a-z]+' | cut -f 2 -d '=' | head -n1)
LB_BOOTAPPEND_INSTALL=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootappend_install=[-0-9a-zA-Z. _+=:/]+' | cut -f2- -d '=' | head -n1)
LB_BOOTAPPEND_LIVE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootappend_live=[-0-9a-zA-Z. _+=:/]+' | cut -f2- -d '=' | head -n1)
LB_BOOTLOADER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootloader=[a-z]+' | cut -f 2 -d '=' | head -n1)
@@ -99,10 +98,6 @@ else
LB_SOURCE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])source=[a-z]+' | cut -f 2 -d '=' | head -n1)
LB_SOURCE_IMAGES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])source_images=[a-z]+' | cut -f 2 -d '=' | head -n1)
- # Unofficial options
- _CUSTOM_BOOTSTRAP=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])custom_bootstrap=[-0-9a-zA-Z.~:/_]+' | cut -f 2 -d '=' | head -n1)
- _CUSTOM_BINARY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])custom_binary=[-0-9a-zA-Z.~:/_]+' | cut -f 2 -d '=' | head -n1)
-
# FIXME: filter invalid options
unset QUERY_STRING
@@ -134,12 +129,11 @@ else
-e "s#_LB_CONFIG#${_LB_CONFIG}#" \
-e "s/_LB_CGIPACKAGES/${_LB_CGIPACKAGES}/" \
-e "s/LB_ARCHITECTURES/${LB_ARCHITECTURES}/" \
- -e "s/LB_BOOTSTRAP_FLAVOUR/${LB_BOOTSTRAP_FLAVOUR}/" \
-e "s/LB_ARCHIVE_AREAS/${LB_ARCHIVE_AREAS}/" \
-e "s/LB_CHROOT_FILESYSTEM/${LB_CHROOT_FILESYSTEM}/" \
-e "s/LB_LINUX_FLAVOURS/${LB_LINUX_FLAVOURS}/" \
-e "s/LB_SECURITY/${LB_SECURITY}/" \
- -e "s/LB_BINARY_INDICES/${LB_BINARY_INDICES}/" \
+ -e "s/LB_APT_INDICES/${LB_APT_INDICES}/" \
-e "s#LB_BOOTAPPEND_INSTALL#${LB_BOOTAPPEND_INSTALL}#" \
-e "s#LB_BOOTAPPEND_LIVE#${LB_BOOTAPPEND_LIVE}#" \
-e "s/LB_BOOTLOADER/${LB_BOOTLOADER}/" \
@@ -154,8 +148,6 @@ else
-e "s#SERVER#${_SERVER}#g" \
-e "s/LB_SOURCE_IMAGES/${LB_SOURCE_IMAGES}/" \
-e "s/LB_SOURCE/${LB_SOURCE}/" \
- -e "s#CUSTOM_BOOTSTRAP#${_CUSTOM_BOOTSTRAP}#" \
- -e "s#CUSTOM_BINARY#${_CUSTOM_BINARY}#" \
"${_TEMPLATES}"/build.html
# Creating temporary directory
@@ -191,7 +183,7 @@ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS}"
LB_SECURITY="${LB_SECURITY}"
# Advanced binary options
-LB_BINARY_INDICES="${LB_BINARY_INDICES}"
+LB_APT_INDICES="${LB_APT_INDICES}"
LB_BOOTAPPEND_INSTALL="${LB_BOOTAPPEND_INSTALL}"
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE}"
LB_BOOTLOADER="${LB_BOOTLOADER}"
@@ -208,14 +200,10 @@ LB_NET_ROOT_SERVER="${LB_NET_ROOT_SERVER}"
LB_SOURCE_IMAGES="${LB_SOURCE_IMAGES}"
LB_SOURCE="${LB_SOURCE}"
-# Unofficial options
-_CUSTOM_BOOTSTRAP="${_CUSTOM_BOOTSTRAP}"
-_CUSTOM_BINARY="${_CUSTOM_BINARY}"
-
EOF
echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: add web build (${_BUILD}) from ${REMOTE_ADDR}." >> /var/log/live
- echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LB_BINARY_IMAGES}|distribution ${LB_DISTRIBUTION}|config ${_LB_CONFIG}|cgipackages ${_LB_CGIPACKAGES}|architectures ${LB_ARCHITECTURES}|archive_areas ${LB_ARCHIVE_AREAS}|chroot_filesystem ${LB_CHROOT_FILESYSTEM}|linux_flavours ${LB_LINUX_FLAVOURS}|security ${LB_SECURITY}|binary_indices ${LB_BINARY_INDICES}|bootappend_install ${LB_BOOTAPPEND_INSTALL}|bootappend_live ${LB_BOOTAPPEND_LIVE}|bootloader ${LB_BOOTLOADER}|debian_installer ${LB_DEBIAN_INSTALLER}|iso_application ${LB_ISO_APPLICATION}|iso_preparer ${LB_ISO_PREPARER}|iso_publisher ${LB_ISO_PUBLISHER}|iso_volume ${LB_ISO_VOLUME}|memtest ${LB_MEMTEST}|net_path ${LB_NET_ROOT_PATH}|net_server ${LB_NET_ROOT_SERVER}|source_images ${LB_SOURCE_IMAGES}|sources ${LB_SOURCE}|custom_bootstrap ${_CUSTOM_BOOTSTRAP}|custom_binary ${_CUSTOM_BINARY}" >> /var/log/live
+ echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LB_BINARY_IMAGES}|distribution ${LB_DISTRIBUTION}|config ${_LB_CONFIG}|cgipackages ${_LB_CGIPACKAGES}|architectures ${LB_ARCHITECTURES}|archive_areas ${LB_ARCHIVE_AREAS}|chroot_filesystem ${LB_CHROOT_FILESYSTEM}|linux_flavours ${LB_LINUX_FLAVOURS}|security ${LB_SECURITY}|apt_indices ${LB_APT_INDICES}|bootappend_install ${LB_BOOTAPPEND_INSTALL}|bootappend_live ${LB_BOOTAPPEND_LIVE}|bootloader ${LB_BOOTLOADER}|debian_installer ${LB_DEBIAN_INSTALLER}|iso_application ${LB_ISO_APPLICATION}|iso_preparer ${LB_ISO_PREPARER}|iso_publisher ${LB_ISO_PUBLISHER}|iso_volume ${LB_ISO_VOLUME}|memtest ${LB_MEMTEST}|net_path ${LB_NET_ROOT_PATH}|net_server ${LB_NET_ROOT_SERVER}|source_images ${LB_SOURCE_IMAGES}|sources ${LB_SOURCE}" >> /var/log/live
fi
sed -e "s/VERSION/${VERSION}/" "${_TEMPLATES}"/footer.html
diff --git a/frontends/cgi/live-build-cgi.cron b/frontends/cgi/live-build-cgi.cron
index 0035438..89d4ae7 100755
--- a/frontends/cgi/live-build-cgi.cron
+++ b/frontends/cgi/live-build-cgi.cron
@@ -7,9 +7,8 @@
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
-
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+. /usr/lib/live/build.sh
# Reading defaults
if [ -r /etc/default/live-build-cgi ]
@@ -61,66 +60,48 @@ if Find_files ${_TEMPDIR}/*.build
then
for _FILE in "${_TEMPDIR}"/*.build
do
- # Pull in the variables we want from the config file.
- # Pul in the build number
- _BUILD=`awk -F\" '/^_BUILD=/{print $2}' ${_FILE}`
- # Pull in the email address
- _EMAIL=`awk -F\" '/^_EMAIL=/{print $2}' ${_FILE}`
- # Pull in cgipackages for config/package-lists/cgipackages.list.chroot
- _LB_CGIPACKAGES=`awk -F\" '/^_LB_CGIPACKAGES=/{print $2}' ${_FILE}`
- # Pull in config for git clone
- _LB_CONFIG=`awk -F\" '/^_LB_CONFIG=/{print $2}' ${_FILE}`
- # Pull in the remote address, atchitecture, distribution, and package-lists.
- _REMOTE_ADDR=`awk -F\" '/^REMOTE_ADDR=/{print $2}' ${_FILE}`
- _LB_ARCHITECTURES=`awk -F\" '/^LB_ARCHITECTURES=/{print $2}' ${_FILE}`
- _LB_DISTRIBUTION=`awk -F\" '/^LB_DISTRIBUTION=/{print $2}' ${_FILE}`
- # Pull in the custom bootstrap
- _CUSTOM_BOOTSTRAP=`awk -F\" '/^_CUSTOM_BOOTSTRAP=/{print $2}' ${_FILE}`
- # Pull in the custom binary
- _CUSTOM_BINARY=`awk -F\" '/^_CUSTOM_BINARY=/{print $2}' ${_FILE}`
-
- # Drop out some build data for information if something goes wrong.
- echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: begin web build (${_BUILD})." >> /var/log/live
+ # Pull in variables from the build file.
+ . "${_FILE}"
# Clone the git config to target build directory
git clone ${_LB_CONFIG} "${_TEMPDIR}"/"${_BUILD}" >> /var/log/live
_ERRORGIT="${?}"
- # Creating build directory and the config/package-lists
+ # Drop out some build data for information if something goes wrong.
+ echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: begin web build (${_BUILD})." >> /var/log/live
+
+ # Creating directory for the config/package-lists
mkdir -p "${_TEMPDIR}"/"${_BUILD}"/config/package-lists
- # The next two tests are for unofficial third party archives
+ # Add cgipackages.list.chroot
if [ -n "${_LB_CGIPACKAGES}" ]
then
echo "${_LB_CGIPACKAGES}" > "${_TEMPDIR}"/"${_BUILD}"/config/package-lists/cgipackages.list.chroot
fi
- # Creating the config/chroot_sources folder
- mkdir -p "${_TEMPDIR}"/"${_BUILD}"/config/chroot_sources
+ _DATE_START="`date -R`"
+ echo "Begin: ${_DATE_START}" > "${_TEMPDIR}"/"${_BUILD}"/log
- # The next two tests are for unofficial third party archives
- if [ -n "${_CUSTOM_BOOTSTRAP}" ]
+ # Generating config here
+ if [ "${_ERRORGIT}" -eq "0" ]
then
- echo "${_CUSTOM_BOOTSTRAP}" > "${_TEMPDIR}"/"${_BUILD}"/config/chroot_sources/custom.bootstrap
+ cd "${_TEMPDIR}"/"${_BUILD}"
+ # Do config with git and stack on config file params to build
+ lb config --distribution "${LB_DISTRIBUTION}" --architectures "${LB_ARCHITECTURES}" --archive-areas "${LB_ARCHIVE_AREAS}" --chroot-filesystem "${LB_CHROOT_FILESYSTEM}" --linux-flavours "${LB_LINUX_FLAVOURS}" --security "${LB_SECURITY}" --apt-indices "${LB_APT_INDICES}" --bootappend-install "${LB_BOOTAPPEND_INSTALL}" --bootappend-live "${LB_BOOTAPPEND_LIVE}" --bootloader "${LB_BOOTLOADER}" --debian-installer "${LB_DEBIAN_INSTALLER}" --iso-application "${LB_ISO_APPLICATION}" --iso-preparer "${LB_ISO_PREPARER}" --iso-publisher "${LB_ISO_PUBLISHER}" --iso-volume "${LB_ISO_VOLUME}" --memtest "${LB_MEMTEST}" --net-root-path "${LB_NET_ROOT_PATH}" --net-root-server "${LB_NET_ROOT_SERVER}" --source-images "${LB_SOURCE_IMAGES}" --source "${LB_SOURCE}"
+ _ERRORCONFIG="${?}"
+ else
+ echo "Config stage skipped. The git clone produced an error: ${_ERRORGIT}" > "${_TEMPDIR}"/"${_BUILD}"/log
fi
- if [ -n "${_CUSTOM_BINARY}" ]
+ # Run build if config went ok
+ if [ "${_ERRORCONFIG}" -eq "0" ]
then
- echo "${_CUSTOM_BINARY}" > "${_TEMPDIR}"/"${_BUILD}"/config/chroot_sources/custom.binary
+ lb build >> "${_TEMPDIR}"/"${_BUILD}"/log 2>&1
+ _ERRORBUILD="${?}"
+ else
+ echo "Build stage skipped. Config produced an error: ${_ERRORCONFIG}" > "${_TEMPDIR}"/"${_BUILD}"/log
fi
- _DATE_START="`date -R`"
- echo "Begin: ${_DATE_START}" > "${_TEMPDIR}"/"${_BUILD}"/log
-
- # Generating image here
- cd "${_TEMPDIR}"/"${_BUILD}"
- # Stack on config file params to build dir
- lb config -c ${_FILE} >> "${_TEMPDIR}"/"${_BUILD}"/log 2>&1
- _ERRORCONFIG="${?}"
- # Run build
- lb build >> "${_TEMPDIR}"/"${_BUILD}"/log 2>&1
- _ERRORBUILD="${?}"
-
_DATE_END="`date -R`"
echo "End: ${_DATE_END}" >> "${_TEMPDIR}"/"${_BUILD}"/log
@@ -131,10 +112,10 @@ then
if [ "${_ERRORGIT}" -eq "0" ] && [ "${_ERRORCONFIG}" -eq "0" ] && [ "${_ERRORBUILD}" -eq "0" ]
then
_STATUS="maybe-successful"
- echo "${_REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${_LB_ARCHITECTURES}/${_LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 200 - \"-\" \"\"">>/var/log/live-cgi.builds
+ echo "${REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${LB_ARCHITECTURES}/${LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 200 - \"-\" \"\"">>/var/log/live-cgi.builds
else
_STATUS="maybe-failed"
- echo "${_REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${_LB_ARCHITECTURES}/${_LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 404 - \"-\" \"\"">>/var/log/live-cgi.builds
+ echo "${REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${LB_ARCHITECTURES}/${LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 404 - \"-\" \"\"">>/var/log/live-cgi.builds
fi
sed -e "s/BUILD/${_BUILD}/g" \
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 08da782..a6c1ea7 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -15,8 +15,7 @@ Set_defaults ()
if [ -e local/live-build ]
then
LIVE_BUILD="${LIVE_BUILD:-${PWD}/local/live-build}"
- PATH="${PWD}/local/live-build/scripts/build:${PATH}"
- export LIVE_BUILD PATH
+ export LIVE_BUILD
fi
# Setting system type
@@ -51,7 +50,7 @@ Set_defaults ()
# Setting distribution name
case "${LB_MODE}" in
progress)
- LB_DISTRIBUTION="${LB_DISTRIBUTION:-artax}"
+ LB_DISTRIBUTION="${LB_DISTRIBUTION:-baureo}"
LB_DERIVATIVE="true"
;;
@@ -166,9 +165,6 @@ Set_defaults ()
elif [ -x "/usr/bin/cdebootstrap" ]
then
LB_BOOTSTRAP="cdebootstrap"
- else
- Echo_error "Cannot find /usr/sbin/debootstrap or /usr/bin/cdebootstrap. Please install debootstrap or cdebootstrap, or specify an alternative bootstrapping utility."
- exit 1
fi
fi
@@ -377,27 +373,6 @@ Set_defaults ()
fi
fi
- # Include packages on base
- case "${LB_MODE}" in
- ubuntu|kubuntu)
- LB_BOOTSTRAP_INCLUDE="${LB_BOOTSTRAP_INCLUDE:-gnupg}"
- ;;
-
- esac
-
- # Exclude packages on base
- # LB_BOOTSTRAP_EXCLUDE
-
- # Setting flavour value
- case "${LB_BOOTSTRAP}" in
- cdebootstrap)
- LB_BOOTSTRAP_FLAVOUR="${LB_BOOTSTRAP_FLAVOUR:-standard}"
- ;;
- esac
-
- # Setting bootstrap keyring
- # LB_BOOTSTRAP_KEYRING
-
# Setting mirror to fetch packages from
case "${LB_MODE}" in
debian)
@@ -512,7 +487,7 @@ Set_defaults ()
# Setting mirror which ends up in the image
case "${LB_MODE}" in
debian)
- LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://cdn.debian.net/debian/}"
+ LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://http.debian.net/debian/}"
LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-${LB_MIRROR_BINARY}}"
;;
@@ -596,7 +571,7 @@ Set_defaults ()
;;
esac
- LB_PARENT_MIRROR_BINARY_VOLATILE="${LB_PARENT_MIRROR_BINARY_VOLATILE:-${LB_PARENT_MIRROR}}"
+ LB_PARENT_MIRROR_BINARY_VOLATILE="${LB_PARENT_MIRROR_BINARY_VOLATILE:-${LB_PARENT_MIRROR_BINARY}}"
;;
*)
@@ -607,7 +582,7 @@ Set_defaults ()
# Setting backports mirror which ends up in the image
case "${LB_MODE}" in
debian)
- LB_MIRROR_BINARY_BACKPORTS="${LB_MIRROR_BINARY_BACKPORTS:-http://backports.debian.org/debian-backports/}"
+ LB_MIRROR_BINARY_BACKPORTS="${LB_MIRROR_BINARY_BACKPORTS:-http://http.debian.net/debian-backports/}"
LB_PARENT_MIRROR_BINARY_BACKPORTS="${LB_PARENT_MIRROR_BINARY_BACKPORTS:-${LB_MIRROR_BINARY_BACKPORTS}}"
;;
@@ -1330,7 +1305,7 @@ Check_defaults ()
LB_BOOTSTRAP_QEMU_ARCHITECTURES="${LB_BOOTSTRAP_QEMU_ARCHITECTURES:-}"
# Packages to exclude for the foreign/ports bootstrapping
- LB_BOOTSTRAP_QEMU_EXCLUDE="${LB_PORTS_BOOTSTRAP_EXCLUDE:-}"
+ LB_BOOTSTRAP_QEMU_EXCLUDE="${LB_BOOTSTRAP_QEMU_EXCLUDE:-}"
# Ports using foreign bootstrap need a working qemu-*-system. This is the location it
LB_BOOTSTRAP_QEMU_STATIC="${LB_BOOTSTRAP_QEMU_STATIC:-}"
diff --git a/manpages/de/lb.de.1 b/manpages/de/lb.de.1
index 3eb0262..9e674ae 100644
--- a/manpages/de/lb.de.1
+++ b/manpages/de/lb.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a58\-1 "Debian Live Project"
.SH NAME
\fBlb\fP \- wrapper for live\-build programs
diff --git a/manpages/de/lb_binary.de.1 b/manpages/de/lb_binary.de.1
index 4ed2815..acb17a8 100644
--- a/manpages/de/lb_binary.de.1
+++ b/manpages/de/lb_binary.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a58\-1 "Debian Live Project"
.SH NAME
\fBlb binary\fP \- Complete the binary stage
diff --git a/manpages/de/lb_bootstrap.de.1 b/manpages/de/lb_bootstrap.de.1
index ab715d0..bf5e399 100644
--- a/manpages/de/lb_bootstrap.de.1
+++ b/manpages/de/lb_bootstrap.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a58\-1 "Debian Live Project"
.SH NAME
\fBlb bootstrap\fP \- Complete the bootstrap stage
diff --git a/manpages/de/lb_build.de.1 b/manpages/de/lb_build.de.1
index 8d9103e..1f5459b 100644
--- a/manpages/de/lb_build.de.1
+++ b/manpages/de/lb_build.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a58\-1 "Debian Live Project"
.SH NAME
\fBlb build\fP \- Complete the bootstrap, chroot, binary, and source stages
diff --git a/manpages/de/lb_chroot.de.1 b/manpages/de/lb_chroot.de.1
index ab93ec1..7c646d7 100644
--- a/manpages/de/lb_chroot.de.1
+++ b/manpages/de/lb_chroot.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a58\-1 "Debian Live Project"
.SH NAME
\fBlb chroot\fP \- Complete the chroot stage
diff --git a/manpages/de/lb_clean.de.1 b/manpages/de/lb_clean.de.1
index b4cb826..03adf8d 100644
--- a/manpages/de/lb_clean.de.1
+++ b/manpages/de/lb_clean.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a58\-1 "Debian Live Project"
.SH NAME
\fBlb clean\fP \- Clean build directory
diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1
index 676bb10..96f6c87 100644
--- a/manpages/de/lb_config.de.1
+++ b/manpages/de/lb_config.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a58\-1 "Debian Live Project"
.SH NAME
\fBlb config\fP \- Create config directory
@@ -48,10 +48,6 @@
.br
[\fB\-\-bootstrap\fP cdebootstrap|cdebootstrap\-static|debootstrap|copy]
.br
- [\-f|\fB\-\-bootstrap\-flavour\fP minimal|standard]
-.br
- [\fB\-\-bootstrap\-keyring\fP \fIPACKAGE\fP]
-.br
[\fB\-\-cache\fP true|false]
.br
[\fB\-\-cache\-indices\fP true|false]
@@ -354,13 +350,6 @@ 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\fP 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\fP \fIPACKAGE\fP" 4
-sets the archive keyring package to be used. Default is
-debian\-archive\-keyring.
.IP "\fB\-\-cache\fP true|false" 4
defines globally if any cache should be used at all. Different caches can be
controled through the their own options.
@@ -489,10 +478,10 @@ defines which hooks available in /usr/share/live/build/examples/hooks should
be activated. Normally, there are no hooks executed. Make sure you know and
understood the hook before you enable it.
.IP \fB\-\-ignore\-system\-defaults\fP 4
-\fBlb config\fP by default reads system defaults from /etc/live/build.conf and
-/etc/live/build.d when generating a new live system config directory. This
-is useful if you want to set global settings, such as mirror locations, and
-don't want to specify them all of the time.
+\fBlb config\fP by default reads system defaults from \fI/etc/live/build.conf\fP
+and \fI/etc/live/build/*\fP when generating a new live system config
+directory. This is useful if you want to set global settings, such as mirror
+locations, and don't want to specify them all of the time.
.IP "\fB\-\-initramfs\fP auto|none|live\-boot|casper" 4
sets the name of package that contains the live system specific initramfs
modification. By default, auto is used, which means that at build time of
@@ -589,11 +578,11 @@ sets the location of the debian package mirror that should end up configured
in the final image and which is the one a user would see and use. This has
not necessarily to be the same that is used to build the image, e.g. if you
use a local mirror but want to have an official mirror in the image. By
-default, 'http://cdn.debian.net/debian/' is used.
+default, 'http://http.debian.net/debian/' is used.
.IP "\fB\-\-parent\-mirror\-binary\-security\fP \fIURL\fP" 4
sets the location of the debian security package mirror that should end up
-configured in the final image. By default,
-\&'http://cdn.debian.net/debian\-security/' is used.
+configured in the final image. By default, 'http://security.debian.org/' is
+used.
.IP "\fB\-\-parent\-mirror\-binary\-volatile\fP \fIURL\fP" 4
sets the location of the debian volatile package mirror that should end up
configured in the final image. By default, the value of
@@ -795,7 +784,7 @@ GZIP_OPTIONS, no LB_ prefix is used.
.SH FILES
.\" FIXME
.IP \fBauto/config\fP 4
-.IP "\fB/etc/live/build.conf, /etc/live/build.d\fP" 4
+.IP "\fB/etc/live/build.conf, /etc/live/build/*\fP" 4
.\" FIXME
An optional, global configuration file for \fBlb config\fP variables. It is
useful to specify a few system wide defaults, like
diff --git a/manpages/de/lb_source.de.1 b/manpages/de/lb_source.de.1
index 5413dc3..df2670a 100644
--- a/manpages/de/lb_source.de.1
+++ b/manpages/de/lb_source.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a58\-1 "Debian Live Project"
.SH NAME
\fBlb source\fP \- Complete the source stage
diff --git a/manpages/de/lb_testroot.de.1 b/manpages/de/lb_testroot.de.1
index 3101ce7..b2489f5 100644
--- a/manpages/de/lb_testroot.de.1
+++ b/manpages/de/lb_testroot.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a58\-1 "Debian Live Project"
.SH NAME
\fBlb testroot\fP \- Ensure that a system is built as root
diff --git a/manpages/de/live-build.de.7 b/manpages/de/live-build.de.7
index 99e6c2a..660ec23 100644
--- a/manpages/de/live-build.de.7
+++ b/manpages/de/live-build.de.7
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 7 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 7 2012\-08\-27 3.0~a58\-1 "Debian Live Project"
.SH NAME
\fBlive\-build\fP \- the Debian Live tool suite
@@ -271,7 +271,7 @@ also put comments in these files; lines beginning with "#" are ignored.
.SH FILES
.IP \fB/etc/live/build.conf\fP 4
-.IP \fB/etc/live/build.d/\fP 4
+.IP \fB/etc/live/build/*\fP 4
.SH "SEE ALSO"
\fIlive\-boot\fP(7)
diff --git a/manpages/en/lb.1 b/manpages/en/lb.1
index f7afdf6..ea76591 100644
--- a/manpages/en/lb.1
+++ b/manpages/en/lb.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a58-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 623c371..f934100 100644
--- a/manpages/en/lb_binary.1
+++ b/manpages/en/lb_binary.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a58-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 475a7d9..7580f6c 100644
--- a/manpages/en/lb_bootstrap.1
+++ b/manpages/en/lb_bootstrap.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a58-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 63f6404..16db860 100644
--- a/manpages/en/lb_build.1
+++ b/manpages/en/lb_build.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a58-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 652d264..69c4cbc 100644
--- a/manpages/en/lb_chroot.1
+++ b/manpages/en/lb_chroot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a58-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 da805ed..aba47ea 100644
--- a/manpages/en/lb_clean.1
+++ b/manpages/en/lb_clean.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a58-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 aeb466a..5785493 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a58-1 "Debian Live Project"
.SH NAME
\fBlb config\fR \- Create config directory
@@ -43,10 +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]
.br
[\fB\-\-cache\-indices\fR true|false]
@@ -287,10 +283,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
defines globally if any cache should be used at all. Different caches can be controled through the their own options.
.IP "\fB\-\-cache\-indices\fR true|false" 4
@@ -348,7 +340,7 @@ defines the default options that will be appended to (almost) every gzip call du
.IP "\fB\-\-hooks\fR \fIFILE\fR" 4
defines which hooks available in /usr/share/live/build/examples/hooks should be activated. Normally, there are no hooks executed. Make sure you know and understood the hook before you enable it.
.IP "\fB\-\-ignore\-system\-defaults\fR" 4
-\fBlb config\fR by default reads system defaults from /etc/live/build.conf and /etc/live/build.d when generating a new live system config directory. This is useful if you want to set global settings, such as mirror locations, and don't want to specify them all of the time.
+\fBlb config\fR by default reads system defaults from \fI/etc/live/build.conf\fR and \fI/etc/live/build/*\fR when generating a new live system config directory. This is useful if you want to set global settings, such as mirror locations, and don't want to specify them all of the time.
.IP "\fB\-\-initramfs\fR auto|none|live\-boot|casper" 4
sets the name of package that contains the live system specific initramfs modification. By default, auto is used, which means that at build time of the image rather than on configuration time, the value will be expanded to casper when building ubuntu systems, to live\-boot for all other systems. Using 'none' is useful if the resulting system image should not be a live image (experimental).
.IP "\fB\-\-initramfs\-compression\fR bzip2|gzip|lzma]
@@ -388,9 +380,9 @@ sets the location of the debian volatile package mirror that will be used to fet
.IP "\fB\-\-parent\-mirror\-chroot\-backports\fR \fIURL\fR" 4
sets the location of the debian backports package mirror that will be used to fetch packages in order to build the live system. By default, this points to http://backports.debian.org/debian-backports/.
.IP "\fB\-\-parent\-mirror\-binary\fR \fIURL\fR" 4
-sets the location of the debian package mirror that should end up configured in the final image and which is the one a user would see and use. This has not necessarily to be the same that is used to build the image, e.g. if you use a local mirror but want to have an official mirror in the image. By default, 'http://cdn.debian.net/debian/' is used.
+sets the location of the debian package mirror that should end up configured in the final image and which is the one a user would see and use. This has not necessarily to be the same that is used to build the image, e.g. if you use a local mirror but want to have an official mirror in the image. By default, 'http://http.debian.net/debian/' is used.
.IP "\fB\-\-parent\-mirror\-binary\-security\fR \fIURL\fR" 4
-sets the location of the debian security package mirror that should end up configured in the final image. By default, 'http://cdn.debian.net/debian-security/' is used.
+sets the location of the debian security package mirror that should end up configured in the final image. By default, 'http://security.debian.org/' is used.
.IP "\fB\-\-parent\-mirror\-binary\-volatile\fR \fIURL\fR" 4
sets the location of the debian volatile package mirror that should end up configured in the final image. By default, the value of \-\-parent\-mirror\-binary is used.
.IP "\fB\-\-parent\-mirror\-binary\-backports\fR \fIURL\fR" 4
@@ -502,7 +494,7 @@ Currently, command line switches can also be specified through the corresponding
.SH FILES
.\" FIXME
.IP "\fBauto/config\fR" 4
-.IP "\fB/etc/live/build.conf, /etc/live/build.d\fR" 4
+.IP "\fB/etc/live/build.conf, /etc/live/build/*\fR" 4
An optional, global configuration file for \fBlb config\fR variables. It is useful to specify a few system wide defaults, like LB_PARENT_MIRROR_BOOTSTRAP. This feature can be false by specifying the \fB\-\-ignore\-system\-defaults\fR option.
.\" FIXME
diff --git a/manpages/en/lb_source.1 b/manpages/en/lb_source.1
index 39df638..e97b739 100644
--- a/manpages/en/lb_source.1
+++ b/manpages/en/lb_source.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a58-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 160cf87..b1c0dac 100644
--- a/manpages/en/lb_testroot.1
+++ b/manpages/en/lb_testroot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-27 3.0~a58-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 54795e3..8b957f1 100644
--- a/manpages/en/live-build.7
+++ b/manpages/en/live-build.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 7 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 7 2012\-08\-27 3.0~a58-1 "Debian Live Project"
.SH NAME
\fBlive\-build\fR \- the Debian Live tool suite
@@ -224,7 +224,7 @@ All config files are shell scripts which are sourced by a live\-build program. T
.SH FILES
.IP "\fB/etc/live/build.conf\fR" 4
-.IP "\fB/etc/live/build.d/\fR" 4
+.IP "\fB/etc/live/build/*\fR" 4
.SH SEE ALSO
\fIlive\-boot\fR(7)
diff --git a/manpages/po/de/lb.1.po b/manpages/po/de/lb.1.po
index 7bc7f87..70bdc62 100644
--- a/manpages/po/de/lb.1.po
+++ b/manpages/po/de/lb.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-27 16:32+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\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 "2012-08-10"
+msgid "2012-08-27"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a57-1"
+msgid "3.0~a58-1"
msgstr ""
#. type: TH
@@ -81,7 +81,7 @@ msgstr ""
#. type: SH
#: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:243 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:239 en/lb_source.1:9
#: en/lb_testroot.1:9 en/live-build.7:11
#, no-wrap
msgid "DESCRIPTION"
@@ -96,7 +96,7 @@ msgstr ""
#. type: SH
#: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:252 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:248 en/lb_source.1:14
#: en/lb_testroot.1:18 en/live-build.7:20
#, no-wrap
msgid "OPTIONS"
@@ -112,7 +112,7 @@ msgstr ""
#. type: SH
#: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:502 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
#: en/lb_testroot.1:21 en/live-build.7:225
#, no-wrap
msgid "FILES"
@@ -127,7 +127,7 @@ msgstr ""
#. type: SH
#: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:509 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
#: en/lb_testroot.1:24 en/live-build.7:229
#, no-wrap
msgid "SEE ALSO"
@@ -135,21 +135,21 @@ msgstr ""
#. type: Plain text
#: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:511 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:503 en/lb_source.1:22
#: en/lb_testroot.1:26
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
#: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:517 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
#: en/lb_testroot.1:28 en/live-build.7:235
msgid "This program is a part of live-build."
msgstr ""
#. type: SH
#: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:518 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
#: en/lb_testroot.1:29 en/live-build.7:236
#, no-wrap
msgid "HOMEPAGE"
@@ -157,7 +157,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:520 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
#: en/lb_testroot.1:31 en/live-build.7:238
msgid ""
"More information about live-build and the Debian Live project can be found "
@@ -167,7 +167,7 @@ msgstr ""
#. type: SH
#: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:521 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
#: en/lb_testroot.1:32 en/live-build.7:239
#, no-wrap
msgid "BUGS"
@@ -175,7 +175,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:523 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
#: en/lb_testroot.1:34 en/live-build.7:241
msgid ""
"Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -186,7 +186,7 @@ msgstr ""
#. type: SH
#: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:524 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
#: en/lb_testroot.1:35 en/live-build.7:242
#, no-wrap
msgid "AUTHOR"
@@ -194,7 +194,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:525 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
#: en/lb_testroot.1:36 en/live-build.7:243
msgid ""
"live-build was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
diff --git a/manpages/po/de/lb_binary.1.po b/manpages/po/de/lb_binary.1.po
index dc4df5a..9205f5a 100644
--- a/manpages/po/de/lb_binary.1.po
+++ b/manpages/po/de/lb_binary.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-27 16:32+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\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 "2012-08-10"
+msgid "2012-08-27"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a57-1"
+msgid "3.0~a58-1"
msgstr ""
#. type: TH
@@ -66,7 +66,7 @@ msgstr ""
#. type: SH
#: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:243 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:239 en/lb_source.1:9
#: en/lb_testroot.1:9 en/live-build.7:11
#, no-wrap
msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
#. type: SH
#: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:252 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:248 en/lb_source.1:14
#: en/lb_testroot.1:18 en/live-build.7:20
#, no-wrap
msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
#. type: SH
#: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:502 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
#: en/lb_testroot.1:21 en/live-build.7:225
#, no-wrap
msgid "FILES"
@@ -97,7 +97,7 @@ msgstr ""
#. type: SH
#: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:509 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
#: en/lb_testroot.1:24 en/live-build.7:229
#, no-wrap
msgid "SEE ALSO"
@@ -105,21 +105,21 @@ msgstr ""
#. type: Plain text
#: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:511 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:503 en/lb_source.1:22
#: en/lb_testroot.1:26
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
#: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:517 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
#: en/lb_testroot.1:28 en/live-build.7:235
msgid "This program is a part of live-build."
msgstr ""
#. type: SH
#: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:518 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
#: en/lb_testroot.1:29 en/live-build.7:236
#, no-wrap
msgid "HOMEPAGE"
@@ -127,7 +127,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:520 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
#: en/lb_testroot.1:31 en/live-build.7:238
msgid ""
"More information about live-build and the Debian Live project can be found "
@@ -137,7 +137,7 @@ msgstr ""
#. type: SH
#: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:521 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
#: en/lb_testroot.1:32 en/live-build.7:239
#, no-wrap
msgid "BUGS"
@@ -145,7 +145,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:523 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
#: en/lb_testroot.1:34 en/live-build.7:241
msgid ""
"Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -156,7 +156,7 @@ msgstr ""
#. type: SH
#: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:524 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
#: en/lb_testroot.1:35 en/live-build.7:242
#, no-wrap
msgid "AUTHOR"
@@ -164,7 +164,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:525 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
#: en/lb_testroot.1:36 en/live-build.7:243
msgid ""
"live-build was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
diff --git a/manpages/po/de/lb_bootstrap.1.po b/manpages/po/de/lb_bootstrap.1.po
index 970155b..b2e8c04 100644
--- a/manpages/po/de/lb_bootstrap.1.po
+++ b/manpages/po/de/lb_bootstrap.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-27 16:32+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\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 "2012-08-10"
+msgid "2012-08-27"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a57-1"
+msgid "3.0~a58-1"
msgstr ""
#. type: TH
@@ -66,7 +66,7 @@ msgstr ""
#. type: SH
#: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:243 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:239 en/lb_source.1:9
#: en/lb_testroot.1:9 en/live-build.7:11
#, no-wrap
msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
#. type: SH
#: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:252 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:248 en/lb_source.1:14
#: en/lb_testroot.1:18 en/live-build.7:20
#, no-wrap
msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
#. type: SH
#: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:502 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
#: en/lb_testroot.1:21 en/live-build.7:225
#, no-wrap
msgid "FILES"
@@ -97,7 +97,7 @@ msgstr ""
#. type: SH
#: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:509 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
#: en/lb_testroot.1:24 en/live-build.7:229
#, no-wrap
msgid "SEE ALSO"
@@ -105,21 +105,21 @@ msgstr ""
#. type: Plain text
#: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:511 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:503 en/lb_source.1:22
#: en/lb_testroot.1:26
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
#: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:517 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
#: en/lb_testroot.1:28 en/live-build.7:235
msgid "This program is a part of live-build."
msgstr ""
#. type: SH
#: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:518 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
#: en/lb_testroot.1:29 en/live-build.7:236
#, no-wrap
msgid "HOMEPAGE"
@@ -127,7 +127,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:520 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
#: en/lb_testroot.1:31 en/live-build.7:238
msgid ""
"More information about live-build and the Debian Live project can be found "
@@ -137,7 +137,7 @@ msgstr ""
#. type: SH
#: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:521 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
#: en/lb_testroot.1:32 en/live-build.7:239
#, no-wrap
msgid "BUGS"
@@ -145,7 +145,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:523 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
#: en/lb_testroot.1:34 en/live-build.7:241
msgid ""
"Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -156,7 +156,7 @@ msgstr ""
#. type: SH
#: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:524 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
#: en/lb_testroot.1:35 en/live-build.7:242
#, no-wrap
msgid "AUTHOR"
@@ -164,7 +164,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:525 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
#: en/lb_testroot.1:36 en/live-build.7:243
msgid ""
"live-build was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
diff --git a/manpages/po/de/lb_build.1.po b/manpages/po/de/lb_build.1.po
index cbbd06b..b1c6c80 100644
--- a/manpages/po/de/lb_build.1.po
+++ b/manpages/po/de/lb_build.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-27 16:32+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\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 "2012-08-10"
+msgid "2012-08-27"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a57-1"
+msgid "3.0~a58-1"
msgstr ""
#. type: TH
@@ -66,7 +66,7 @@ msgstr ""
#. type: SH
#: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:243 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:239 en/lb_source.1:9
#: en/lb_testroot.1:9 en/live-build.7:11
#, no-wrap
msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
#. type: SH
#: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:252 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:248 en/lb_source.1:14
#: en/lb_testroot.1:18 en/live-build.7:20
#, no-wrap
msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
#. type: SH
#: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:502 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
#: en/lb_testroot.1:21 en/live-build.7:225
#, no-wrap
msgid "FILES"
@@ -90,7 +90,7 @@ msgstr ""
#. type: SH
#: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:509 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
#: en/lb_testroot.1:24 en/live-build.7:229
#, no-wrap
msgid "SEE ALSO"
@@ -98,21 +98,21 @@ msgstr ""
#. type: Plain text
#: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:511 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:503 en/lb_source.1:22
#: en/lb_testroot.1:26
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
#: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:517 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
#: en/lb_testroot.1:28 en/live-build.7:235
msgid "This program is a part of live-build."
msgstr ""
#. type: SH
#: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:518 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
#: en/lb_testroot.1:29 en/live-build.7:236
#, no-wrap
msgid "HOMEPAGE"
@@ -120,7 +120,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:520 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
#: en/lb_testroot.1:31 en/live-build.7:238
msgid ""
"More information about live-build and the Debian Live project can be found "
@@ -130,7 +130,7 @@ msgstr ""
#. type: SH
#: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:521 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
#: en/lb_testroot.1:32 en/live-build.7:239
#, no-wrap
msgid "BUGS"
@@ -138,7 +138,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:523 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
#: en/lb_testroot.1:34 en/live-build.7:241
msgid ""
"Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -149,7 +149,7 @@ msgstr ""
#. type: SH
#: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:524 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
#: en/lb_testroot.1:35 en/live-build.7:242
#, no-wrap
msgid "AUTHOR"
@@ -157,7 +157,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:525 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
#: en/lb_testroot.1:36 en/live-build.7:243
msgid ""
"live-build was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
diff --git a/manpages/po/de/lb_chroot.1.po b/manpages/po/de/lb_chroot.1.po
index 76e0f63..87f3ad3 100644
--- a/manpages/po/de/lb_chroot.1.po
+++ b/manpages/po/de/lb_chroot.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-27 16:32+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\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 "2012-08-10"
+msgid "2012-08-27"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a57-1"
+msgid "3.0~a58-1"
msgstr ""
#. type: TH
@@ -66,7 +66,7 @@ msgstr ""
#. type: SH
#: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:243 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:239 en/lb_source.1:9
#: en/lb_testroot.1:9 en/live-build.7:11
#, no-wrap
msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
#. type: SH
#: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:252 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:248 en/lb_source.1:14
#: en/lb_testroot.1:18 en/live-build.7:20
#, no-wrap
msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
#. type: SH
#: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:502 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
#: en/lb_testroot.1:21 en/live-build.7:225
#, no-wrap
msgid "FILES"
@@ -97,7 +97,7 @@ msgstr ""
#. type: SH
#: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:509 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
#: en/lb_testroot.1:24 en/live-build.7:229
#, no-wrap
msgid "SEE ALSO"
@@ -105,21 +105,21 @@ msgstr ""
#. type: Plain text
#: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:511 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:503 en/lb_source.1:22
#: en/lb_testroot.1:26
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
#: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:517 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
#: en/lb_testroot.1:28 en/live-build.7:235
msgid "This program is a part of live-build."
msgstr ""
#. type: SH
#: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:518 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
#: en/lb_testroot.1:29 en/live-build.7:236
#, no-wrap
msgid "HOMEPAGE"
@@ -127,7 +127,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:520 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
#: en/lb_testroot.1:31 en/live-build.7:238
msgid ""
"More information about live-build and the Debian Live project can be found "
@@ -137,7 +137,7 @@ msgstr ""
#. type: SH
#: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:521 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
#: en/lb_testroot.1:32 en/live-build.7:239
#, no-wrap
msgid "BUGS"
@@ -145,7 +145,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:523 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
#: en/lb_testroot.1:34 en/live-build.7:241
msgid ""
"Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -156,7 +156,7 @@ msgstr ""
#. type: SH
#: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:524 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
#: en/lb_testroot.1:35 en/live-build.7:242
#, no-wrap
msgid "AUTHOR"
@@ -164,7 +164,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:525 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
#: en/lb_testroot.1:36 en/live-build.7:243
msgid ""
"live-build was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
diff --git a/manpages/po/de/lb_clean.1.po b/manpages/po/de/lb_clean.1.po
index 6f21617..64354e5 100644
--- a/manpages/po/de/lb_clean.1.po
+++ b/manpages/po/de/lb_clean.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-27 16:32+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\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 "2012-08-10"
+msgid "2012-08-27"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a57-1"
+msgid "3.0~a58-1"
msgstr ""
#. type: TH
@@ -66,7 +66,7 @@ msgstr ""
#. type: SH
#: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:243 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:239 en/lb_source.1:9
#: en/lb_testroot.1:9 en/live-build.7:11
#, no-wrap
msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
#. type: SH
#: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:252 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:248 en/lb_source.1:14
#: en/lb_testroot.1:18 en/live-build.7:20
#, no-wrap
msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
#. type: SH
#: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:502 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
#: en/lb_testroot.1:21 en/live-build.7:225
#, no-wrap
msgid "FILES"
@@ -90,7 +90,7 @@ msgstr ""
#. type: SH
#: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:509 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
#: en/lb_testroot.1:24 en/live-build.7:229
#, no-wrap
msgid "SEE ALSO"
@@ -98,21 +98,21 @@ msgstr ""
#. type: Plain text
#: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:511 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:503 en/lb_source.1:22
#: en/lb_testroot.1:26
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
#: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:517 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
#: en/lb_testroot.1:28 en/live-build.7:235
msgid "This program is a part of live-build."
msgstr ""
#. type: SH
#: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:518 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
#: en/lb_testroot.1:29 en/live-build.7:236
#, no-wrap
msgid "HOMEPAGE"
@@ -120,7 +120,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:520 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
#: en/lb_testroot.1:31 en/live-build.7:238
msgid ""
"More information about live-build and the Debian Live project can be found "
@@ -130,7 +130,7 @@ msgstr ""
#. type: SH
#: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:521 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
#: en/lb_testroot.1:32 en/live-build.7:239
#, no-wrap
msgid "BUGS"
@@ -138,7 +138,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:523 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
#: en/lb_testroot.1:34 en/live-build.7:241
msgid ""
"Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -149,7 +149,7 @@ msgstr ""
#. type: SH
#: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:524 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
#: en/lb_testroot.1:35 en/live-build.7:242
#, no-wrap
msgid "AUTHOR"
@@ -157,7 +157,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:525 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
#: en/lb_testroot.1:36 en/live-build.7:243
msgid ""
"live-build was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po
index a776fd8..055efcf 100644
--- a/manpages/po/de/lb_config.1.po
+++ b/manpages/po/de/lb_config.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-27 16:32+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\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 "2012-08-10"
+msgid "2012-08-27"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a57-1"
+msgid "3.0~a58-1"
msgstr ""
#. type: TH
@@ -66,7 +66,7 @@ msgstr ""
#. type: SH
#: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:243 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:239 en/lb_source.1:9
#: en/lb_testroot.1:9 en/live-build.7:11
#, no-wrap
msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
#. type: SH
#: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:252 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:248 en/lb_source.1:14
#: en/lb_testroot.1:18 en/live-build.7:20
#, no-wrap
msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
#. type: SH
#: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:502 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
#: en/lb_testroot.1:21 en/live-build.7:225
#, no-wrap
msgid "FILES"
@@ -90,7 +90,7 @@ msgstr ""
#. type: SH
#: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:509 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
#: en/lb_testroot.1:24 en/live-build.7:229
#, no-wrap
msgid "SEE ALSO"
@@ -98,21 +98,21 @@ msgstr ""
#. type: Plain text
#: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:511 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:503 en/lb_source.1:22
#: en/lb_testroot.1:26
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
#: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:517 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
#: en/lb_testroot.1:28 en/live-build.7:235
msgid "This program is a part of live-build."
msgstr ""
#. type: SH
#: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:518 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
#: en/lb_testroot.1:29 en/live-build.7:236
#, no-wrap
msgid "HOMEPAGE"
@@ -120,7 +120,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:520 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
#: en/lb_testroot.1:31 en/live-build.7:238
msgid ""
"More information about live-build and the Debian Live project can be found "
@@ -130,7 +130,7 @@ msgstr ""
#. type: SH
#: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:521 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
#: en/lb_testroot.1:32 en/live-build.7:239
#, no-wrap
msgid "BUGS"
@@ -138,7 +138,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:523 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
#: en/lb_testroot.1:34 en/live-build.7:241
msgid ""
"Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -149,7 +149,7 @@ msgstr ""
#. type: SH
#: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:524 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
#: en/lb_testroot.1:35 en/live-build.7:242
#, no-wrap
msgid "AUTHOR"
@@ -157,7 +157,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:525 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
#: en/lb_testroot.1:36 en/live-build.7:243
msgid ""
"live-build was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
@@ -267,500 +267,490 @@ msgstr ""
#. type: Plain text
#: en/lb_config.1:47
-msgid " [-f|B<--bootstrap-flavour> minimal|standard]"
-msgstr ""
-
-#. type: Plain text
-#: en/lb_config.1:49
-msgid " [B<--bootstrap-keyring> I<PACKAGE>]"
-msgstr ""
-
-#. type: Plain text
-#: en/lb_config.1:51
msgid " [B<--cache> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:53
+#: en/lb_config.1:49
msgid " [B<--cache-indices> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:55
+#: en/lb_config.1:51
msgid " [B<--cache-packages> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:57
+#: en/lb_config.1:53
msgid " [B<--cache-stages> I<STAGE>|I<\"STAGES\">]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:59
+#: en/lb_config.1:55
msgid " [B<--checksums> md5|sha1|sha256|none]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:61
+#: en/lb_config.1:57
msgid " [B<--compression> bzip2|gzip|lzip|none]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:63
+#: en/lb_config.1:59
msgid " [B<--config> I<GIT_URL::GIT_ID>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:65
+#: en/lb_config.1:61
msgid " [B<--build-with-chroot> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:67
+#: en/lb_config.1:63
msgid " [B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:69
+#: en/lb_config.1:65
msgid " [B<--clean>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:71
+#: en/lb_config.1:67
msgid " [-c|B<--conffile> I<FILE>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:73
+#: en/lb_config.1:69
msgid " [B<--debconf-frontend> dialog|editor|noninteractive|readline]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:75
+#: en/lb_config.1:71
msgid " [B<--debconf-nowarnings> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:77
+#: en/lb_config.1:73
msgid " [B<--debconf-priority> low|medium|high|critical]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:79
+#: en/lb_config.1:75
msgid ""
" [B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:81
+#: en/lb_config.1:77
msgid " [B<--debian-installer-distribution> daily|I<CODENAME>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:83
+#: en/lb_config.1:79
msgid " [B<--debian-installer-preseedfile> I<FILE>|I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:85
+#: en/lb_config.1:81
msgid " [B<--debian-installer-gui> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:87
+#: en/lb_config.1:83
msgid " [B<--debug>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:89
+#: en/lb_config.1:85
msgid " [-d|B<--distribution> I<CODENAME>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:91
+#: en/lb_config.1:87
msgid " [B<--parent-distribution> I<CODENAME>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:93
+#: en/lb_config.1:89
msgid " [B<--parent-debian-installer-distribution> I<CODENAME>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:95
+#: en/lb_config.1:91
msgid " [B<--dump>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:97
+#: en/lb_config.1:93
msgid " [B<--fdisk> fdisk|fdisk.dist]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:99
+#: en/lb_config.1:95
msgid " [B<--firmware-binary true|false>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:101
+#: en/lb_config.1:97
msgid " [B<--firmware-chroot true|false>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:103
+#: en/lb_config.1:99
msgid " [B<--force>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:105
+#: en/lb_config.1:101
msgid " [B<--grub-splash> I<FILE>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:107
+#: en/lb_config.1:103
msgid " [B<--gzip-options> I<OPTION>|\"I<OPTIONS>\"]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:109
+#: en/lb_config.1:105
msgid " [B<--hooks> I<FILE>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:111
+#: en/lb_config.1:107
msgid " [B<--ignore-system-defaults>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:113
+#: en/lb_config.1:109
msgid " [B<--initramfs> auto|none|live-boot|casper]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:115
+#: en/lb_config.1:111
msgid " [B<--initramfs-compression> bzip2|gzip|lzma]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:117
+#: en/lb_config.1:113
msgid " [B<--initsystem> sysvinit|runit|systemd|upstart|none]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:119
+#: en/lb_config.1:115
msgid " [B<--interactive> shell]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:121
+#: en/lb_config.1:117
msgid " [B<--isohybrid-options> I<OPTION>|\"I<OPTIONS>\"]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:123
+#: en/lb_config.1:119
msgid " [B<--iso-application> I<NAME>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:125
+#: en/lb_config.1:121
msgid " [B<--iso-preparer> I<NAME>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:127
+#: en/lb_config.1:123
msgid " [B<--iso-publisher> I<NAME>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:129
+#: en/lb_config.1:125
msgid " [B<--iso-volume> I<NAME>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:131
+#: en/lb_config.1:127
msgid " [B<--jffs2-eraseblock> I<SIZE>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:133
+#: en/lb_config.1:129
msgid " [B<--keyring-packages> I<PACKAGE|\"PACKAGES\">]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:135
+#: en/lb_config.1:131
msgid " [-k|B<--linux-flavours> I<FLAVOUR>|I<\"FLAVOURS\">]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:137
+#: en/lb_config.1:133
msgid " [B<--linux-packages> I<\"PACKAGES\">]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:139
+#: en/lb_config.1:135
msgid " [B<--losetup> losetup|losetup.orig]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:141
+#: en/lb_config.1:137
msgid " [B<--memtest> memtest86+|memtest86|none]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:143
+#: en/lb_config.1:139
msgid " [-m|B<--parent-mirror-bootstrap> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:145
+#: en/lb_config.1:141
msgid " [B<--parent-mirror-chroot> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:147
+#: en/lb_config.1:143
msgid " [B<--parent-mirror-chroot-security> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:149
+#: en/lb_config.1:145
msgid " [B<--parent-mirror-chroot-volatile> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:151
+#: en/lb_config.1:147
msgid " [B<--parent-mirror-chroot-backports> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:153
+#: en/lb_config.1:149
msgid " [B<--parent-mirror-binary> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:155
+#: en/lb_config.1:151
msgid " [B<--parent-mirror-binary-security> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:157
+#: en/lb_config.1:153
msgid " [B<--parent-mirror-binary-volatile> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:159
+#: en/lb_config.1:155
msgid " [B<--parent-mirror-binary-backports> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:161
+#: en/lb_config.1:157
msgid " [B<--parent-mirror-debian-installer> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:163
+#: en/lb_config.1:159
msgid " [B<--mirror-bootstrap> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:165
+#: en/lb_config.1:161
msgid " [B<--mirror-chroot> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:167
+#: en/lb_config.1:163
msgid " [B<--mirror-chroot-security> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:169
+#: en/lb_config.1:165
msgid " [B<--mirror-chroot-volatile> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:171
+#: en/lb_config.1:167
msgid " [B<--mirror-chroot-backports> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:173
+#: en/lb_config.1:169
msgid " [B<--mirror-binary> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:175
+#: en/lb_config.1:171
msgid " [B<--mirror-binary-security> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:177
+#: en/lb_config.1:173
msgid " [B<--mirror-binary-volatile> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:179
+#: en/lb_config.1:175
msgid " [B<--mirror-binary-backports> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:181
+#: en/lb_config.1:177
msgid " [B<--mirror-debian-installer> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:183
+#: en/lb_config.1:179
msgid " [B<--mode> debian|emdebian|progress|ubuntu|kubuntu]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:185
+#: en/lb_config.1:181
msgid " [B<--system> live|normal]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:187
+#: en/lb_config.1:183
msgid " [B<--net-root-filesystem> nfs|cfs]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:189
+#: en/lb_config.1:185
msgid " [B<--net-root-mountoptions> I<OPTIONS>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:191
+#: en/lb_config.1:187
msgid " [B<--net-root-path> I<PATH>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:193
+#: en/lb_config.1:189
msgid " [B<--net-root-server> I<IP>|I<HOSTNAME>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:195
+#: en/lb_config.1:191
msgid " [B<--net-cow-filesystem> nfs|cfs]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:197
+#: en/lb_config.1:193
msgid " [B<--net-cow-mountoptions> I<OPTIONS>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:199
+#: en/lb_config.1:195
msgid " [B<--net-cow-path> I<PATH>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:201
+#: en/lb_config.1:197
msgid " [B<--net-cow-server> I<IP>|I<HOSTNAME>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:203
+#: en/lb_config.1:199
msgid " [B<--net-tarball> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:205
+#: en/lb_config.1:201
msgid " [-p|B<--package-lists> I<LIST>|I<\"LISTS\">]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:207
+#: en/lb_config.1:203
msgid " [B<--quiet>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:209
+#: en/lb_config.1:205
msgid " [B<--root-command> sudo]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:211
+#: en/lb_config.1:207
msgid " [B<--use-fakeroot> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:213
+#: en/lb_config.1:209
msgid " [B<--archives> I<ARCHIVE>|I<\"ARCHIVES\">]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:215
+#: en/lb_config.1:211
msgid " [B<--archive-areas> I<ARCHIVE_AREA>|I<\"ARCHIVE_AREAS\">]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:217
+#: en/lb_config.1:213
msgid ""
" [B<--parent-archive-areas> I<PARENT_ARCHIVE_AREA>|I<\"PARENT_ARCHIVE_AREAS"
"\">]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:219
+#: en/lb_config.1:215
msgid " [B<--security> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:221
+#: en/lb_config.1:217
msgid " [B<--source> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:223
+#: en/lb_config.1:219
msgid " [-s|B<--source-images> iso|netboot|tar|hdd]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:225
+#: en/lb_config.1:221
msgid " [B<--syslinux-theme> I<THEME_SUFFIX>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:227
+#: en/lb_config.1:223
msgid " [B<--tasksel> apt|aptitude|tasksel]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:229
+#: en/lb_config.1:225
msgid " [B<--templates> I<PATH>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:231
+#: en/lb_config.1:227
msgid " [B<--hdd-size >I<MB>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:233
+#: en/lb_config.1:229
msgid " [B<--volatile> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:235
+#: en/lb_config.1:231
msgid " [B<--backports> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:237
+#: en/lb_config.1:233
msgid " [B<--exposed-root> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:239
+#: en/lb_config.1:235
msgid " [B<--verbose>]"
msgstr ""
#. FIXME
#. type: Plain text
-#: en/lb_config.1:242
+#: en/lb_config.1:238
msgid " [B<--win32-loader true|false]>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:245
+#: en/lb_config.1:241
msgid ""
"B<lb config> is a high-level command (porcelain) of I<live-build>(7), the "
"Debian Live tool suite."
@@ -768,7 +758,7 @@ msgstr ""
#. FIXME
#. type: Plain text
-#: en/lb_config.1:248
+#: en/lb_config.1:244
msgid ""
"B<lb config> populates the configuration directory for live-build. By "
"default, this directory is named 'config' and is created in the current "
@@ -777,7 +767,7 @@ msgstr ""
#. FIXME
#. type: Plain text
-#: en/lb_config.1:251
+#: en/lb_config.1:247
msgid ""
"Note: Currently B<lb config> tries to be smart and sets defaults for some "
"options depending on the setting of other options (e.g. which linux packages "
@@ -793,7 +783,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:254
+#: en/lb_config.1:250
msgid ""
"In addition to its specific options B<lb config> understands all generic "
"live-build options. See I<live-build>(7) for a complete list of all generic "
@@ -802,26 +792,26 @@ msgstr ""
#. FIXME
#. type: IP
-#: en/lb_config.1:256
+#: en/lb_config.1:252
#, no-wrap
msgid "B<--apt> apt|aptitude"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:258
+#: en/lb_config.1:254
msgid ""
"defines if apt-get or aptitude is used to install packages when building the "
"image. The default is apt."
msgstr ""
#. type: IP
-#: en/lb_config.1:258
+#: en/lb_config.1:254
#, no-wrap
msgid "B<--apt-ftp-proxy> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:260
+#: en/lb_config.1:256
msgid ""
"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 "
@@ -829,13 +819,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:260
+#: en/lb_config.1:256
#, no-wrap
msgid "B<--apt-http-proxy> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:262
+#: en/lb_config.1:258
msgid ""
"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 "
@@ -843,26 +833,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:262
+#: en/lb_config.1:258
#, no-wrap
msgid "B<--apt-indices> true|false|none"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:264
+#: en/lb_config.1:260
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."
msgstr ""
#. type: IP
-#: en/lb_config.1:264
+#: en/lb_config.1:260
#, no-wrap
msgid "B<--apt-options> I<OPTION>|\"I<OPTIONS>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:266
+#: en/lb_config.1:262
msgid ""
"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 "
@@ -870,13 +860,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:266
+#: en/lb_config.1:262
#, no-wrap
msgid "B<--aptitude-options> I<OPTION>|\"I<OPTIONS>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:268
+#: en/lb_config.1:264
msgid ""
"defines the default options that will be appended to every aptitude call "
"that is made inside chroot during building of the image. By default, this is "
@@ -884,13 +874,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:268
+#: en/lb_config.1:264
#, no-wrap
msgid "B<--apt-pipeline> I<DEPTH>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:270
+#: en/lb_config.1:266
msgid ""
"sets the depth of the apt/aptitude pipeline. In cases where the remote "
"server is not RFC conforming or buggy (such as Squid 2.0.2) this option can "
@@ -902,51 +892,51 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:270
+#: en/lb_config.1:266
#, no-wrap
msgid "B<--apt-recommends> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:272
+#: en/lb_config.1:268
msgid ""
"defines if apt should install recommended packages automatically. By "
"default, this is true except in emdebian mode."
msgstr ""
#. type: IP
-#: en/lb_config.1:272
+#: en/lb_config.1:268
#, no-wrap
msgid "B<--apt-secure> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:274
+#: en/lb_config.1:270
msgid ""
"defines if apt should check repository signatures. This is true by default."
msgstr ""
#. type: IP
-#: en/lb_config.1:274
+#: en/lb_config.1:270
#, no-wrap
msgid "B<--apt-source-archives> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:276
+#: en/lb_config.1:272
msgid ""
"defines if deb-src entries should be included in the resulting live image or "
"not, defaults to on."
msgstr ""
#. type: IP
-#: en/lb_config.1:276
+#: en/lb_config.1:272
#, no-wrap
msgid "-a|B<--architectures> I<ARCHITECTURE>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:278
+#: en/lb_config.1:274
msgid ""
"defines the architecture of the to be build image. By default, this is set "
"to the host architecture. Note that you cannot crossbuild for another "
@@ -957,13 +947,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:278
+#: en/lb_config.1:274
#, no-wrap
msgid "-b|B<--binary-images> iso|iso-hybrid|netboot|tar|hdd"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:280
+#: en/lb_config.1:276
msgid ""
"defines the image type to build. By default, for images using syslinux this "
"is set to iso-hybrid to build CD/DVD images that may also be used like hdd "
@@ -971,13 +961,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:280
+#: en/lb_config.1:276
#, no-wrap
msgid "B<--binary-filesystem> fat16|fat32|ext2|ext3|ext4"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:282
+#: en/lb_config.1:278
msgid ""
"defines the filesystem to be used in the image type. This only has an effect "
"if the selected binary image type does allow to choose a filesystem. For "
@@ -990,24 +980,24 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:282
+#: en/lb_config.1:278
#, no-wrap
msgid "B<--bootappend-install> I<PARAMETER>|\"I<PARAMETERS>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:284
+#: en/lb_config.1:280
msgid "sets boot parameters specific to debian-installer, if included."
msgstr ""
#. type: IP
-#: en/lb_config.1:284
+#: en/lb_config.1:280
#, no-wrap
msgid "B<--bootappend-live> I<PARAMETER>|\"I<PARAMETERS>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:286
+#: en/lb_config.1:282
msgid ""
"sets boot parameters specific to debian-live. A complete list of boot "
"parameters can be found in the I<live-boot>(7) and I<live-config>(7) manual "
@@ -1015,13 +1005,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:286
+#: en/lb_config.1:282
#, no-wrap
msgid "B<--bootloader> grub|syslinux|yaboot"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:288
+#: en/lb_config.1:284
msgid ""
"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 "
@@ -1034,13 +1024,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:288
+#: en/lb_config.1:284
#, no-wrap
msgid "B<--bootstrap> cdebootstrap|cdebootstrap-static|debootstrap|copy"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:290
+#: en/lb_config.1:286
msgid ""
"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 "
@@ -1050,53 +1040,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:290
-#, no-wrap
-msgid "-f|B<--bootstrap-flavour> minimal|standard"
-msgstr ""
-
-#. type: Plain text
-#: en/lb_config.1:292
-msgid ""
-"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)."
-msgstr ""
-
-#. type: IP
-#: en/lb_config.1:292
-#, no-wrap
-msgid "B<--bootstrap-keyring> I<PACKAGE>"
-msgstr ""
-
-#. type: Plain text
-#: en/lb_config.1:294
-msgid ""
-"sets the archive keyring package to be used. Default is debian-archive-"
-"keyring."
-msgstr ""
-
-#. type: IP
-#: en/lb_config.1:294
+#: en/lb_config.1:286
#, no-wrap
msgid "B<--cache> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:296
+#: en/lb_config.1:288
msgid ""
"defines globally if any cache should be used at all. Different caches can be "
"controled through the their own options."
msgstr ""
#. type: IP
-#: en/lb_config.1:296
+#: en/lb_config.1:288
#, no-wrap
msgid "B<--cache-indices> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:298
+#: en/lb_config.1:290
msgid ""
"defines if downloaded package indices and lists should be cached which is "
"false by default. Enabling it would allow to rebuild an image completely "
@@ -1104,13 +1067,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:298
+#: en/lb_config.1:290
#, no-wrap
msgid "B<--cache-packages> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:300
+#: en/lb_config.1:292
msgid ""
"defines if downloaded packages files should be cached which is true by "
"default. Disabling it does save space consumtion in your build directory, "
@@ -1121,13 +1084,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:300
+#: en/lb_config.1:292
#, no-wrap
msgid "B<--cache-stages> true|false|I<STAGE>|\"I<STAGES>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:302
+#: en/lb_config.1:294
msgid ""
"sets which stages should be cached. By default set to bootstrap. As an "
"exception to the normal stage names, also rootfs can be used here which does "
@@ -1137,13 +1100,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:302
+#: en/lb_config.1:294
#, no-wrap
msgid "B<--checksums> md5|sha1|sha256|none"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:304
+#: en/lb_config.1:296
msgid ""
"defines if the binary image should contain a file called md5sums.txt, "
"sha1sums.txt and/or sha256sums.txt. These lists all files on the image "
@@ -1155,39 +1118,39 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:304
+#: en/lb_config.1:296
#, no-wrap
msgid "B<--compression> bzip2|gzip|lzip|none"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:306
+#: en/lb_config.1:298
msgid ""
"defines the compression program to be used to compress tarballs. Defaults to "
"gzip."
msgstr ""
#. type: IP
-#: en/lb_config.1:306
+#: en/lb_config.1:298
#, no-wrap
msgid "B<--config> I<GIT_URL>::I<GIT_ID>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:308
+#: en/lb_config.1:300
msgid ""
"allows to bootstrap a config tree from a git repositories, optionally "
"appended by a Git Id (branch, commit, tag, etc.)."
msgstr ""
#. type: IP
-#: en/lb_config.1:308
+#: en/lb_config.1:300
#, no-wrap
msgid "B<--build-with-chroot> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:310
+#: en/lb_config.1:302
msgid ""
"defines whetever live-build should use the tools from within the chroot to "
"build the binary image or not by using and including the host systems tools. "
@@ -1202,13 +1165,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:310
+#: en/lb_config.1:302
#, no-wrap
msgid "B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:312
+#: en/lb_config.1:304
msgid ""
"defines which filesystem type should be used for the root filesystem image. "
"If you use none, then no filesystem image is created and the root filesystem "
@@ -1219,39 +1182,39 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:312
+#: en/lb_config.1:304
#, no-wrap
msgid "B<--clean>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:314
+#: en/lb_config.1:306
msgid ""
"minimizes config directory by automatically removing unused and thus empty "
"subdirectories."
msgstr ""
#. type: IP
-#: en/lb_config.1:314
+#: en/lb_config.1:306
#, no-wrap
msgid "-c|B<--conffile> I<FILE>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:316
+#: en/lb_config.1:308
msgid ""
"using a user specified alternative configuration file in addition to the "
"normally used one in the config directory."
msgstr ""
#. type: IP
-#: en/lb_config.1:316
+#: en/lb_config.1:308
#, no-wrap
msgid "B<--debconf-frontend> dialog|editor|noninteractive|readline"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:318
+#: en/lb_config.1:310
msgid ""
"defines what value the debconf frontend should be set to inside the chroot. "
"Note that setting it to anything by noninteractive, which is the default, "
@@ -1259,13 +1222,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:318
+#: en/lb_config.1:310
#, no-wrap
msgid "B<--debconf-nowarnings> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:320
+#: en/lb_config.1:312
msgid ""
"defines if warnings of debconf should be displayed or not. Warnings from "
"debconf are generally very rare and by default, we skip them, if any, in "
@@ -1273,13 +1236,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:320
+#: en/lb_config.1:312
#, no-wrap
msgid "B<--debconf-priority> low|medium|high|critical"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:322
+#: en/lb_config.1:314
msgid ""
"defines what value the debconf priority shoul dbe set to inside the chroot. "
"By default, it is set to critical, which means that almost no questions are "
@@ -1288,13 +1251,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:322
+#: en/lb_config.1:314
#, no-wrap
msgid "B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:324
+#: en/lb_config.1:316
msgid ""
"defines which type, if any, of the debian-installer should be included in "
"the resulting binary image. By default, no installer is included. All "
@@ -1306,13 +1269,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:324
+#: en/lb_config.1:316
#, no-wrap
msgid "B<--debian-installer-distribution> daily|I<CODENAME>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:326
+#: en/lb_config.1:318
msgid ""
"defines the distribution where the debian-installer files should be taken "
"out from. Normally, this should be set to the same distribution as the live "
@@ -1321,13 +1284,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:326
+#: en/lb_config.1:318
#, no-wrap
msgid "B<--debian-installer-preseedfile> I<FILE>|I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:328
+#: en/lb_config.1:320
msgid ""
"sets the filename or URL for an optionally used and included preseeding file "
"for debian-installer. If config/binary_debian-installer/preseed.cfg exists, "
@@ -1335,13 +1298,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:328
+#: en/lb_config.1:320
#, no-wrap
msgid "B<--debian-installer-gui> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:330
+#: en/lb_config.1:322
msgid ""
"defines if the debian-installer graphical GTK interface should be true or "
"not. In Debian mode and for most versions of Ubuntu, this option is true, "
@@ -1349,60 +1312,60 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:330 en/live-build.7:36
+#: en/lb_config.1:322 en/live-build.7:36
#, no-wrap
msgid "B<--debug>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:332
+#: en/lb_config.1:324
msgid "turn on debugging informational messages."
msgstr ""
#. type: IP
-#: en/lb_config.1:332
+#: en/lb_config.1:324
#, no-wrap
msgid "-d|B<--distribution> I<CODENAME>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:334
+#: en/lb_config.1:326
msgid "defines the distribution of the resulting live system."
msgstr ""
#. type: IP
-#: en/lb_config.1:334
+#: en/lb_config.1:326
#, no-wrap
msgid "-d|B<--parent-distribution> I<CODENAME>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:336
+#: en/lb_config.1:328
msgid ""
"defines the parent distribution for derivatives of the resulting live system."
msgstr ""
#. type: IP
-#: en/lb_config.1:336
+#: en/lb_config.1:328
#, no-wrap
msgid "-d|B<--parent-debian-installer-distribution> I<CODENAME>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:338
+#: en/lb_config.1:330
msgid ""
"defines the parent debian-installer distribution for derivatives of the "
"resulting live system."
msgstr ""
#. type: IP
-#: en/lb_config.1:338
+#: en/lb_config.1:330
#, no-wrap
msgid "B<--dump>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:340
+#: en/lb_config.1:332
msgid ""
"prepares a report of the currently present live system configuration and the "
"version of live-build used. This is useful to provide if you submit bug "
@@ -1411,26 +1374,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:340
+#: en/lb_config.1:332
#, no-wrap
msgid "B<--fdisk> fdisk|fdisk.dist"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:342
+#: en/lb_config.1:334
msgid ""
"sets the filename of the fdisk binary from the host system that should be "
"used. This is autodetected and does generally not need any customization."
msgstr ""
#. type: IP
-#: en/lb_config.1:342 en/live-build.7:38
+#: en/lb_config.1:334 en/live-build.7:38
#, no-wrap
msgid "B<--force>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:344
+#: en/lb_config.1:336
msgid ""
"forces re-execution of already run stages. Use only if you know what you are "
"doing. It is generally safer to use B<lb clean> to clean up before re-"
@@ -1438,26 +1401,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:344
+#: en/lb_config.1:336
#, no-wrap
msgid "B<--grub-splash> I<FILE>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:346
+#: en/lb_config.1:338
msgid ""
"defines the name of an optional to be included splash screen graphic for the "
"grub bootloader."
msgstr ""
#. type: IP
-#: en/lb_config.1:346
+#: en/lb_config.1:338
#, no-wrap
msgid "B<--gzip-options> I<OPTION>|\"I<OPTIONS>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:348
+#: en/lb_config.1:340
msgid ""
"defines the default options that will be appended to (almost) every gzip "
"call during the building of the image. By default, this is set to --best to "
@@ -1466,13 +1429,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:348
+#: en/lb_config.1:340
#, no-wrap
msgid "B<--hooks> I<FILE>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:350
+#: en/lb_config.1:342
msgid ""
"defines which hooks available in /usr/share/live/build/examples/hooks should "
"be activated. Normally, there are no hooks executed. Make sure you know and "
@@ -1480,28 +1443,28 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:350
+#: en/lb_config.1:342
#, no-wrap
msgid "B<--ignore-system-defaults>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:352
+#: en/lb_config.1:344
msgid ""
-"B<lb config> by default reads system defaults from /etc/live/build.conf and /"
-"etc/live/build.d when generating a new live system config directory. This is "
-"useful if you want to set global settings, such as mirror locations, and "
-"don't want to specify them all of the time."
+"B<lb config> by default reads system defaults from I</etc/live/build.conf> "
+"and I</etc/live/build/*> when generating a new live system config directory. "
+"This is useful if you want to set global settings, such as mirror locations, "
+"and don't want to specify them all of the time."
msgstr ""
#. type: IP
-#: en/lb_config.1:352
+#: en/lb_config.1:344
#, no-wrap
msgid "B<--initramfs> auto|none|live-boot|casper"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:354
+#: en/lb_config.1:346
msgid ""
"sets the name of package that contains the live system specific initramfs "
"modification. By default, auto is used, which means that at build time of "
@@ -1512,26 +1475,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:354
+#: en/lb_config.1:346
#, no-wrap
msgid "B<--initramfs-compression> bzip2|gzip|lzma]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:356
+#: en/lb_config.1:348
msgid ""
"defines the compression program to be used to compress the initramfs. "
"Defaults to gzip."
msgstr ""
#. type: IP
-#: en/lb_config.1:356
+#: en/lb_config.1:348
#, no-wrap
msgid "B<--interactive> shell"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:358
+#: en/lb_config.1:350
msgid ""
"defines if after the chroot stage and before the beginning of the binary "
"stage, a interactive shell login should be spawned in the chroot in order to "
@@ -1545,24 +1508,24 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:358
+#: en/lb_config.1:350
#, no-wrap
msgid "B<--isohybrid-options> I<OPTION>|\"I<OPTIONS>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:360
+#: en/lb_config.1:352
msgid "defines options to pass to isohybrid."
msgstr ""
#. type: IP
-#: en/lb_config.1:360
+#: en/lb_config.1:352
#, no-wrap
msgid "B<--iso-application> I<NAME>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:362
+#: en/lb_config.1:354
msgid ""
"sets the APPLICATION field in the header of a resulting CD/DVD image and "
"defaults to \"Debian Live\" in debian mode, and to \"Emdebian Live\" in "
@@ -1570,13 +1533,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:362
+#: en/lb_config.1:354
#, no-wrap
msgid "B<--iso-preparer> I<NAME>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:364
+#: en/lb_config.1:356
msgid ""
"sets the PREPARER field in the header of a resulting CD/DVD image. By "
"default this is set to \"live-build I<VERSION>; http://packages.qa.debian."
@@ -1585,13 +1548,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:364
+#: en/lb_config.1:356
#, no-wrap
msgid "B<--iso-publisher> I<NAME>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:366
+#: en/lb_config.1:358
msgid ""
"sets the PUBLISHED field in the header of a resulting CD/DVD image. By "
"default, this is set to 'Debian Live project; http:/live.debian.net/; debian-"
@@ -1600,13 +1563,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:366
+#: en/lb_config.1:358
#, no-wrap
msgid "B<--iso-volume> I<NAME>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:368
+#: en/lb_config.1:360
msgid ""
"sets the VOLUME field in the header of a resulting CD/DVD and defaults to "
"'(I<MODE>) (I<DISTRIBUTION>) (I<DATE>)' whereas MODE is expanded to the name "
@@ -1615,13 +1578,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:368
+#: en/lb_config.1:360
#, no-wrap
msgid "B<--jffs2-eraseblock> I<SIZE>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:370
+#: en/lb_config.1:362
msgid ""
"sets the eraseblock size for a JFFS2 (Second Journalling Flash File System) "
"filesystem. The default is 64 KiB. If you use an erase block size different "
@@ -1631,39 +1594,39 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:370
+#: en/lb_config.1:362
#, no-wrap
msgid "B<--keyring-packages> I<PACKAGE|\"PACKAGES>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:372
+#: en/lb_config.1:364
msgid ""
"sets the keyring package or additional keyring packages. By default this is "
"set to debian-archive-keyring."
msgstr ""
#. type: IP
-#: en/lb_config.1:372
+#: en/lb_config.1:364
#, no-wrap
msgid "-k|B<--linux-flavours> I<FLAVOUR>|\"I<FLAVOURS>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:374
+#: en/lb_config.1:366
msgid ""
"sets the kernel flavours to be installed. Note that in case you specify more "
"than that the first will be configured the default kernel that gets booted."
msgstr ""
#. type: IP
-#: en/lb_config.1:374
+#: en/lb_config.1:366
#, no-wrap
msgid "B<--linux-packages> \"I<PACKAGES>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:376
+#: en/lb_config.1:368
msgid ""
"sets the internal name of the kernel packages naming scheme. If you use "
"debian kernel packages, you will not have to adjust it. If you decide to use "
@@ -1677,26 +1640,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:376
+#: en/lb_config.1:368
#, no-wrap
msgid "B<--losetup> losetup|losetup.orig"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:378
+#: en/lb_config.1:370
msgid ""
"sets the filename of the losetup binary from the host system that should be "
"used. This is autodetected and does generally not need any customization."
msgstr ""
#. type: IP
-#: en/lb_config.1:378
+#: en/lb_config.1:370
#, no-wrap
msgid "B<--memtest> memtest86+|memtest86|none"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:380
+#: en/lb_config.1:372
msgid ""
"defines if memtest, memtest86+ or no memory tester at all should be included "
"as secondary bootloader configuration. This is only available on amd64 and "
@@ -1704,13 +1667,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:380
+#: en/lb_config.1:372
#, no-wrap
msgid "-m|B<--parent-mirror-bootstrap> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:382
+#: en/lb_config.1:374
msgid ""
"sets the location of the debian package mirror that should be used to "
"bootstrap from. This defaults to http://ftp.de.debian.org/debian/ which may "
@@ -1718,13 +1681,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:382
+#: en/lb_config.1:374
#, no-wrap
msgid "B<--parent-mirror-chroot> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:384
+#: en/lb_config.1:376
msgid ""
"sets the location of the debian package mirror that will be used to fetch "
"the packages in order to build the live system. By default, this is set to "
@@ -1732,13 +1695,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:384
+#: en/lb_config.1:376
#, no-wrap
msgid "B<--parent-mirror-chroot-security> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:386
+#: en/lb_config.1:378
msgid ""
"sets the location of the debian security package mirror that will be used to "
"fetch the packages in order to build the live system. By default, this "
@@ -1746,13 +1709,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:386
+#: en/lb_config.1:378
#, no-wrap
msgid "B<--parent-mirror-chroot-volatile> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:388
+#: en/lb_config.1:380
msgid ""
"sets the location of the debian volatile package mirror that will be used to "
"fetch packages in order to build the live system. By default, this is set to "
@@ -1760,13 +1723,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:388
+#: en/lb_config.1:380
#, no-wrap
msgid "B<--parent-mirror-chroot-backports> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:390
+#: en/lb_config.1:382
msgid ""
"sets the location of the debian backports package mirror that will be used "
"to fetch packages in order to build the live system. By default, this points "
@@ -1774,43 +1737,43 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:390
+#: en/lb_config.1:382
#, no-wrap
msgid "B<--parent-mirror-binary> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:392
+#: en/lb_config.1:384
msgid ""
"sets the location of the debian package mirror that should end up configured "
"in the final image and which is the one a user would see and use. This has "
"not necessarily to be the same that is used to build the image, e.g. if you "
"use a local mirror but want to have an official mirror in the image. By "
-"default, 'http://cdn.debian.net/debian/' is used."
+"default, 'http://http.debian.net/debian/' is used."
msgstr ""
#. type: IP
-#: en/lb_config.1:392
+#: en/lb_config.1:384
#, no-wrap
msgid "B<--parent-mirror-binary-security> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:394
+#: en/lb_config.1:386
msgid ""
"sets the location of the debian security package mirror that should end up "
-"configured in the final image. By default, 'http://cdn.debian.net/debian-"
-"security/' is used."
+"configured in the final image. By default, 'http://security.debian.org/' is "
+"used."
msgstr ""
#. type: IP
-#: en/lb_config.1:394
+#: en/lb_config.1:386
#, no-wrap
msgid "B<--parent-mirror-binary-volatile> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:396
+#: en/lb_config.1:388
msgid ""
"sets the location of the debian volatile package mirror that should end up "
"configured in the final image. By default, the value of --parent-mirror-"
@@ -1818,13 +1781,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:396
+#: en/lb_config.1:388
#, no-wrap
msgid "B<--parent-mirror-binary-backports> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:398
+#: en/lb_config.1:390
msgid ""
"sets the location of the debian backports package mirror that should end up "
"configured in the final image. By default, 'http://backports.debian.org/"
@@ -1832,13 +1795,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:398
+#: en/lb_config.1:390
#, no-wrap
msgid "B<--parent-mirror-debian-installer> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:400
+#: en/lb_config.1:392
msgid ""
"sets the location of the mirror that will be used to fetch the debian "
"installer images. By default, this points to the same mirror used to build "
@@ -1846,13 +1809,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:400
+#: en/lb_config.1:392
#, no-wrap
msgid "B<--mirror-bootstrap> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:402
+#: en/lb_config.1:394
msgid ""
"sets the location of the debian package mirror that should be used to "
"bootstrap the derivative from. This defaults to http://ftp.de.debian.org/"
@@ -1860,13 +1823,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:402
+#: en/lb_config.1:394
#, no-wrap
msgid "B<--mirror-chroot> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:404
+#: en/lb_config.1:396
msgid ""
"sets the location of the debian package mirror that will be used to fetch "
"the packages of the derivative in order to build the live system. By "
@@ -1874,13 +1837,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:404
+#: en/lb_config.1:396
#, no-wrap
msgid "B<--mirror-chroot-security> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:406
+#: en/lb_config.1:398
msgid ""
"sets the location of the debian security package mirror that will be used to "
"fetch the packages of the derivative in order to build the live system. By "
@@ -1888,13 +1851,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:406
+#: en/lb_config.1:398
#, no-wrap
msgid "B<--mirror-chroot-volatile> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:408
+#: en/lb_config.1:400
msgid ""
"sets the location of the debian volatile package mirror that will be used to "
"fetch packages of the derivative in order to build the live system. By "
@@ -1902,13 +1865,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:408
+#: en/lb_config.1:400
#, no-wrap
msgid "B<--mirror-chroot-backports> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:410
+#: en/lb_config.1:402
msgid ""
"sets the location of the debian backports package mirror that will be used "
"to fetch packages of the derivative in order to build the live system. By "
@@ -1916,13 +1879,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:410
+#: en/lb_config.1:402
#, no-wrap
msgid "B<--mirror-binary> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:412
+#: en/lb_config.1:404
msgid ""
"sets the location of the derivative package mirror that should end up "
"configured in the final image and which is the one a user would see and use. "
@@ -1932,52 +1895,52 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:412
+#: en/lb_config.1:404
#, no-wrap
msgid "B<--mirror-binary-security> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:414
+#: en/lb_config.1:406
msgid ""
"sets the location of the derivatives security package mirror that should end "
"up configured in the final image."
msgstr ""
#. type: IP
-#: en/lb_config.1:414
+#: en/lb_config.1:406
#, no-wrap
msgid "B<--mirror-binary-volatile> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:416
+#: en/lb_config.1:408
msgid ""
"sets the location of the derivatives volatile package mirror that should end "
"up configured in the final image."
msgstr ""
#. type: IP
-#: en/lb_config.1:416
+#: en/lb_config.1:408
#, no-wrap
msgid "B<--mirror-binary-backports> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:418
+#: en/lb_config.1:410
msgid ""
"sets the location of the derivatives backports package mirror that should "
"end up configured in the final image."
msgstr ""
#. type: IP
-#: en/lb_config.1:418
+#: en/lb_config.1:410
#, no-wrap
msgid "B<--mirror-debian-installer> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:420
+#: en/lb_config.1:412
msgid ""
"sets the location of the mirror that will be used to fetch the debian "
"installer images of the derivative. By default, this points to the same "
@@ -1985,65 +1948,65 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:420
+#: en/lb_config.1:412
#, no-wrap
msgid "B<--mode> debian|emdebian|progress|ubuntu"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:422
+#: en/lb_config.1:414
msgid ""
"defines a global mode to load project specific defaults. By default this is "
"set to debian."
msgstr ""
#. type: IP
-#: en/lb_config.1:422
+#: en/lb_config.1:414
#, no-wrap
msgid "B<--system> live|normal"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:424
+#: en/lb_config.1:416
msgid ""
"defines if the resulting system image should a live system or a normal, non-"
"live system."
msgstr ""
#. type: IP
-#: en/lb_config.1:424
+#: en/lb_config.1:416
#, no-wrap
msgid "B<--net-root-filesystem> nfs|cfs"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:426
+#: en/lb_config.1:418
msgid ""
"defines the filesystem that will be configured in the bootloader "
"configuration for your netboot image. This defaults to nfs."
msgstr ""
#. type: IP
-#: en/lb_config.1:426
+#: en/lb_config.1:418
#, no-wrap
msgid "B<--net-root-mountoptions> I<OPTIONS>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:428
+#: en/lb_config.1:420
msgid ""
"sets additional options for mounting the root filesystem in netboot images "
"and is by default empty."
msgstr ""
#. type: IP
-#: en/lb_config.1:428
+#: en/lb_config.1:420
#, no-wrap
msgid "B<--net-root-path> I<PATH>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:430
+#: en/lb_config.1:422
msgid ""
"sets the file path that will be configured in the bootloader configuration "
"for your netboot image. This defaults to /srv/debian-live in debian mode and "
@@ -2052,13 +2015,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:430
+#: en/lb_config.1:422
#, no-wrap
msgid "B<--net-root-server> I<IP>|I<HOSTNAME>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:432
+#: en/lb_config.1:424
msgid ""
"sets the IP or hostname that will be configured in the bootloader "
"configuration for the root filesystem of your netboot image. This defaults "
@@ -2066,38 +2029,38 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:432
+#: en/lb_config.1:424
#, no-wrap
msgid "B<--net-cow-filesystem> nfs|cfs"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:434
+#: en/lb_config.1:426
msgid ""
"defines the filesystem type for the copy-on-write layer and defaults to nfs."
msgstr ""
#. type: IP
-#: en/lb_config.1:434
+#: en/lb_config.1:426
#, no-wrap
msgid "B<--net-cow-mountoptions> I<OPTIONS>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:436
+#: en/lb_config.1:428
msgid ""
"sets additional options for mounting the copy-on-write layer in netboot "
"images and is by default empty."
msgstr ""
#. type: IP
-#: en/lb_config.1:436
+#: en/lb_config.1:428
#, no-wrap
msgid "B<--net-cow-path> I<PATH>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:438
+#: en/lb_config.1:430
msgid ""
"defines the path to client writable filesystem. Anywhere that "
"I<client_mac_address> is specified in the path live-boot will substitute the "
@@ -2105,28 +2068,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:441
+#: en/lb_config.1:433
msgid "Example:"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:443
+#: en/lb_config.1:435
msgid "/export/hosts/client_mac_address"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:445
+#: en/lb_config.1:437
msgid "/export/hosts/00-16-D3-33-92-E8"
msgstr ""
#. type: IP
-#: en/lb_config.1:445
+#: en/lb_config.1:437
#, no-wrap
msgid "B<--net-cow-server> I<IP>|I<HOSTNAME>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:447
+#: en/lb_config.1:439
msgid ""
"sets the IP or hostname that will be configured in the bootloader "
"configuration for the copy-on-write filesystem of your netboot image and is "
@@ -2134,13 +2097,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:447
+#: en/lb_config.1:439
#, no-wrap
msgid "B<--net-tarball> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:449
+#: en/lb_config.1:441
msgid ""
"defines if a compressed tarball should be created. Disabling this options "
"leads to no tarball at all, the plain binary directory is considered the "
@@ -2148,13 +2111,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:449
+#: en/lb_config.1:441
#, no-wrap
msgid "-p|B<--package-lists> I<LIST>|\"I<LISTS>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:451
+#: en/lb_config.1:443
msgid ""
"defines which lists available in /usr/share/live/build/package-lists should "
"be used. By default, this is set to standard. Note that in case you have "
@@ -2164,37 +2127,37 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:451 en/live-build.7:40
+#: en/lb_config.1:443 en/live-build.7:40
#, no-wrap
msgid "B<--quiet>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:453
+#: en/lb_config.1:445
msgid "reduces the verbosity of messages output by B<lb build>."
msgstr ""
#. type: IP
-#: en/lb_config.1:453
+#: en/lb_config.1:445
#, no-wrap
msgid "B<--archives> I<ARCHIVE>|\"I<ARCHIVES>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:455
+#: en/lb_config.1:447
msgid ""
"enables one of available third-party archive configurations in /usr/share/"
"live/build/archives."
msgstr ""
#. type: IP
-#: en/lb_config.1:455
+#: en/lb_config.1:447
#, no-wrap
msgid "B<--root-command> sudo"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:457
+#: en/lb_config.1:449
msgid ""
"controls if live-build should use sudo internally to build the live image. "
"Note that this is not well tested and that you should, when relying on sudo, "
@@ -2202,13 +2165,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:457
+#: en/lb_config.1:449
#, no-wrap
msgid "B<--use-fakeroot> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:459
+#: en/lb_config.1:451
msgid ""
"controls if live-build should utilize fakeroot and fakechroot to try and "
"avoid requiring root privillages where possible. By default, this option is "
@@ -2216,13 +2179,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:459
+#: en/lb_config.1:451
#, no-wrap
msgid "B<--archive-areas> I<ARCHIVE_AREA>|\"I<ARCHIVE_AREAS>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:461
+#: en/lb_config.1:453
msgid ""
"defines which package archive areas of a debian packages archive should be "
"used for configured debian package mirrors. By default, this is set to main. "
@@ -2232,37 +2195,37 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:461
+#: en/lb_config.1:453
#, no-wrap
msgid "B<--parent-archive-areas> I<PARENT_ARCHIVE_AREA>|\"I<PARENT_ARCHIVE_AREAS>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:463
+#: en/lb_config.1:455
msgid "defines the archive areas for derivatives of the resulting live system."
msgstr ""
#. type: IP
-#: en/lb_config.1:463
+#: en/lb_config.1:455
#, no-wrap
msgid "B<--security> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:465
+#: en/lb_config.1:457
msgid ""
"defines if the security repositories specified in the security mirror "
"options should be used or not."
msgstr ""
#. type: IP
-#: en/lb_config.1:465
+#: en/lb_config.1:457
#, no-wrap
msgid "B<--source> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:467
+#: en/lb_config.1:459
msgid ""
"defines if a corresponding source image to the binary image should be build. "
"By default this is false because most people do not require this and would "
@@ -2272,24 +2235,24 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:467
+#: en/lb_config.1:459
#, no-wrap
msgid "-s|B<--source-images> iso|netboot|tar|hdd"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:469
+#: en/lb_config.1:461
msgid "defines the image type for the source image. Default is tar."
msgstr ""
#. type: IP
-#: en/lb_config.1:469
+#: en/lb_config.1:461
#, no-wrap
msgid "B<--firmware-binary> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:471
+#: en/lb_config.1:463
msgid ""
"defines if firmware packages should be automatically included into the "
"binary pool for debian-installer. Note that only firmware packages available "
@@ -2300,13 +2263,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:471
+#: en/lb_config.1:463
#, no-wrap
msgid "B<--firmware-chroot> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:473
+#: en/lb_config.1:465
msgid ""
"defines if firmware packages should be automatically included into the live "
"image. Note that only firmware packages available within the configured "
@@ -2316,39 +2279,39 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:473
+#: en/lb_config.1:465
#, no-wrap
msgid "B<--swap-file-path> I<PATH>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:475
+#: en/lb_config.1:467
msgid ""
"defines the path to a swap file to create in the binary image. Default is "
"not to create a swap file."
msgstr ""
#. type: IP
-#: en/lb_config.1:475
+#: en/lb_config.1:467
#, no-wrap
msgid "B<--swap-file-size> I<MB>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:477
+#: en/lb_config.1:469
msgid ""
"defines what size in megabytes the swap file should be, if one is to be "
"created. Default is 512MB."
msgstr ""
#. type: IP
-#: en/lb_config.1:477
+#: en/lb_config.1:469
#, no-wrap
msgid "B<--syslinux-theme> I<THEME_SUFFIX>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:479
+#: en/lb_config.1:471
msgid ""
"defines the syslinux theme to use. The theme suffix is the name of a "
"directory in /usr/share/syslinux/themes/ provided by a package named "
@@ -2357,39 +2320,39 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:479
+#: en/lb_config.1:471
#, no-wrap
msgid "B<--tasksel> apt|aptitude|tasksel"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:481
+#: en/lb_config.1:473
msgid ""
"selects which program is used to install tasks. By default, this is set to "
"tasksel."
msgstr ""
#. type: IP
-#: en/lb_config.1:481
+#: en/lb_config.1:473
#, no-wrap
msgid "B<--templates> I<PATH>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:483
+#: en/lb_config.1:475
msgid ""
"sets the path to the templates that live-build is going to use, e.g. for "
"bootloaders. By default, this is set to /usr/share/live/build/templates/."
msgstr ""
#. type: IP
-#: en/lb_config.1:483
+#: en/lb_config.1:475
#, no-wrap
msgid "B<--hdd-size> MB"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:485
+#: en/lb_config.1:477
msgid ""
"defines what size the hdd image should be. Note that although the default is "
"set to 10000 (= 10GB), it will not need 10GB space on your harddisk as the "
@@ -2397,39 +2360,39 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:485
+#: en/lb_config.1:477
#, no-wrap
msgid "B<--volatile> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:487
+#: en/lb_config.1:479
msgid ""
"defines if debian volatile package archives should be included in the image "
"or not."
msgstr ""
#. type: IP
-#: en/lb_config.1:487
+#: en/lb_config.1:479
#, no-wrap
msgid "B<--backports> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:489
+#: en/lb_config.1:481
msgid ""
"defines if debian backports package archives should be included in the image "
"or not."
msgstr ""
#. type: IP
-#: en/lb_config.1:489
+#: en/lb_config.1:481
#, no-wrap
msgid "B<--exposed-root> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:491
+#: en/lb_config.1:483
msgid ""
"defines whether to expose the root filesystem as read only and not covered "
"by the union filesystem. This has useful implications for certain speciality "
@@ -2437,37 +2400,37 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:491 en/live-build.7:42
+#: en/lb_config.1:483 en/live-build.7:42
#, no-wrap
msgid "B<--verbose>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:493
+#: en/lb_config.1:485
msgid "increases the verbosity of messages output by B<lb build>."
msgstr ""
#. type: IP
-#: en/lb_config.1:493
+#: en/lb_config.1:485
#, no-wrap
msgid "B<--win32-loader true|false>"
msgstr ""
#. FIXME
#. type: Plain text
-#: en/lb_config.1:496
+#: en/lb_config.1:488
msgid "defines if win32-loader should be included in the binary image or not."
msgstr ""
#. type: SH
-#: en/lb_config.1:497
+#: en/lb_config.1:489
#, no-wrap
msgid "ENVIRONMENT"
msgstr ""
#. FIXME
#. type: Plain text
-#: en/lb_config.1:500
+#: en/lb_config.1:492
msgid ""
"Currently, command line switches can also be specified through the "
"corresponding environment variable. However, this generally should not be "
@@ -2481,20 +2444,20 @@ msgstr ""
#. FIXME
#. type: IP
-#: en/lb_config.1:504
+#: en/lb_config.1:496
#, no-wrap
msgid "B<auto/config>"
msgstr ""
#. type: IP
-#: en/lb_config.1:505
+#: en/lb_config.1:497
#, no-wrap
-msgid "B</etc/live/build.conf, /etc/live/build.d>"
+msgid "B</etc/live/build.conf, /etc/live/build/*>"
msgstr ""
#. FIXME
#. type: Plain text
-#: en/lb_config.1:508
+#: en/lb_config.1:500
msgid ""
"An optional, global configuration file for B<lb config> variables. It is "
"useful to specify a few system wide defaults, like "
@@ -2503,11 +2466,11 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:513 en/live-build.7:231
+#: en/lb_config.1:505 en/live-build.7:231
msgid "I<live-boot>(7)"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:515 en/live-build.7:233
+#: en/lb_config.1:507 en/live-build.7:233
msgid "I<live-config>(7)"
msgstr ""
diff --git a/manpages/po/de/lb_source.1.po b/manpages/po/de/lb_source.1.po
index f1948ed..3ef00e8 100644
--- a/manpages/po/de/lb_source.1.po
+++ b/manpages/po/de/lb_source.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-27 16:32+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\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 "2012-08-10"
+msgid "2012-08-27"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a57-1"
+msgid "3.0~a58-1"
msgstr ""
#. type: TH
@@ -66,7 +66,7 @@ msgstr ""
#. type: SH
#: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:243 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:239 en/lb_source.1:9
#: en/lb_testroot.1:9 en/live-build.7:11
#, no-wrap
msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
#. type: SH
#: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:252 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:248 en/lb_source.1:14
#: en/lb_testroot.1:18 en/live-build.7:20
#, no-wrap
msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
#. type: SH
#: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:502 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
#: en/lb_testroot.1:21 en/live-build.7:225
#, no-wrap
msgid "FILES"
@@ -97,7 +97,7 @@ msgstr ""
#. type: SH
#: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:509 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
#: en/lb_testroot.1:24 en/live-build.7:229
#, no-wrap
msgid "SEE ALSO"
@@ -105,21 +105,21 @@ msgstr ""
#. type: Plain text
#: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:511 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:503 en/lb_source.1:22
#: en/lb_testroot.1:26
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
#: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:517 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
#: en/lb_testroot.1:28 en/live-build.7:235
msgid "This program is a part of live-build."
msgstr ""
#. type: SH
#: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:518 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
#: en/lb_testroot.1:29 en/live-build.7:236
#, no-wrap
msgid "HOMEPAGE"
@@ -127,7 +127,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:520 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
#: en/lb_testroot.1:31 en/live-build.7:238
msgid ""
"More information about live-build and the Debian Live project can be found "
@@ -137,7 +137,7 @@ msgstr ""
#. type: SH
#: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:521 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
#: en/lb_testroot.1:32 en/live-build.7:239
#, no-wrap
msgid "BUGS"
@@ -145,7 +145,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:523 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
#: en/lb_testroot.1:34 en/live-build.7:241
msgid ""
"Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -156,7 +156,7 @@ msgstr ""
#. type: SH
#: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:524 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
#: en/lb_testroot.1:35 en/live-build.7:242
#, no-wrap
msgid "AUTHOR"
@@ -164,7 +164,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:525 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
#: en/lb_testroot.1:36 en/live-build.7:243
msgid ""
"live-build was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
diff --git a/manpages/po/de/lb_testroot.1.po b/manpages/po/de/lb_testroot.1.po
index 0b458e9..249df77 100644
--- a/manpages/po/de/lb_testroot.1.po
+++ b/manpages/po/de/lb_testroot.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-27 16:32+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\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 "2012-08-10"
+msgid "2012-08-27"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a57-1"
+msgid "3.0~a58-1"
msgstr ""
#. type: TH
@@ -66,7 +66,7 @@ msgstr ""
#. type: SH
#: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:243 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:239 en/lb_source.1:9
#: en/lb_testroot.1:9 en/live-build.7:11
#, no-wrap
msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
#. type: SH
#: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:252 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:248 en/lb_source.1:14
#: en/lb_testroot.1:18 en/live-build.7:20
#, no-wrap
msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
#. type: SH
#: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:502 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
#: en/lb_testroot.1:21 en/live-build.7:225
#, no-wrap
msgid "FILES"
@@ -97,7 +97,7 @@ msgstr ""
#. type: SH
#: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:509 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
#: en/lb_testroot.1:24 en/live-build.7:229
#, no-wrap
msgid "SEE ALSO"
@@ -105,21 +105,21 @@ msgstr ""
#. type: Plain text
#: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:511 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:503 en/lb_source.1:22
#: en/lb_testroot.1:26
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
#: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:517 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
#: en/lb_testroot.1:28 en/live-build.7:235
msgid "This program is a part of live-build."
msgstr ""
#. type: SH
#: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:518 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
#: en/lb_testroot.1:29 en/live-build.7:236
#, no-wrap
msgid "HOMEPAGE"
@@ -127,7 +127,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:520 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
#: en/lb_testroot.1:31 en/live-build.7:238
msgid ""
"More information about live-build and the Debian Live project can be found "
@@ -137,7 +137,7 @@ msgstr ""
#. type: SH
#: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:521 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
#: en/lb_testroot.1:32 en/live-build.7:239
#, no-wrap
msgid "BUGS"
@@ -145,7 +145,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:523 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
#: en/lb_testroot.1:34 en/live-build.7:241
msgid ""
"Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -156,7 +156,7 @@ msgstr ""
#. type: SH
#: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:524 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
#: en/lb_testroot.1:35 en/live-build.7:242
#, no-wrap
msgid "AUTHOR"
@@ -164,7 +164,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:525 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
#: en/lb_testroot.1:36 en/live-build.7:243
msgid ""
"live-build was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
diff --git a/manpages/po/de/live-build.7.po b/manpages/po/de/live-build.7.po
index bd3496a..e0b2926 100644
--- a/manpages/po/de/live-build.7.po
+++ b/manpages/po/de/live-build.7.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-27 16:32+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\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 "2012-08-10"
+msgid "2012-08-27"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a57-1"
+msgid "3.0~a58-1"
msgstr ""
#. type: TH
@@ -66,7 +66,7 @@ msgstr ""
#. type: SH
#: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:243 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:239 en/lb_source.1:9
#: en/lb_testroot.1:9 en/live-build.7:11
#, no-wrap
msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
#. type: SH
#: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:252 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:248 en/lb_source.1:14
#: en/lb_testroot.1:18 en/live-build.7:20
#, no-wrap
msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
#. type: SH
#: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:502 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
#: en/lb_testroot.1:21 en/live-build.7:225
#, no-wrap
msgid "FILES"
@@ -90,7 +90,7 @@ msgstr ""
#. type: SH
#: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:509 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
#: en/lb_testroot.1:24 en/live-build.7:229
#, no-wrap
msgid "SEE ALSO"
@@ -98,14 +98,14 @@ msgstr ""
#. type: Plain text
#: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:517 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
#: en/lb_testroot.1:28 en/live-build.7:235
msgid "This program is a part of live-build."
msgstr ""
#. type: SH
#: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:518 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
#: en/lb_testroot.1:29 en/live-build.7:236
#, no-wrap
msgid "HOMEPAGE"
@@ -113,7 +113,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:520 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
#: en/lb_testroot.1:31 en/live-build.7:238
msgid ""
"More information about live-build and the Debian Live project can be found "
@@ -123,7 +123,7 @@ msgstr ""
#. type: SH
#: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:521 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
#: en/lb_testroot.1:32 en/live-build.7:239
#, no-wrap
msgid "BUGS"
@@ -131,7 +131,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:523 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
#: en/lb_testroot.1:34 en/live-build.7:241
msgid ""
"Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -142,7 +142,7 @@ msgstr ""
#. type: SH
#: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:524 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
#: en/lb_testroot.1:35 en/live-build.7:242
#, no-wrap
msgid "AUTHOR"
@@ -150,7 +150,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:525 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
#: en/lb_testroot.1:36 en/live-build.7:243
msgid ""
"live-build was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
@@ -158,36 +158,36 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:330 en/live-build.7:36
+#: en/lb_config.1:322 en/live-build.7:36
#, no-wrap
msgid "B<--debug>"
msgstr ""
#. type: IP
-#: en/lb_config.1:342 en/live-build.7:38
+#: en/lb_config.1:334 en/live-build.7:38
#, no-wrap
msgid "B<--force>"
msgstr ""
#. type: IP
-#: en/lb_config.1:451 en/live-build.7:40
+#: en/lb_config.1:443 en/live-build.7:40
#, no-wrap
msgid "B<--quiet>"
msgstr ""
#. type: IP
-#: en/lb_config.1:491 en/live-build.7:42
+#: en/lb_config.1:483 en/live-build.7:42
#, no-wrap
msgid "B<--verbose>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:513 en/live-build.7:231
+#: en/lb_config.1:505 en/live-build.7:231
msgid "I<live-boot>(7)"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:515 en/live-build.7:233
+#: en/lb_config.1:507 en/live-build.7:233
msgid "I<live-config>(7)"
msgstr ""
@@ -1269,5 +1269,5 @@ msgstr ""
#. type: IP
#: en/live-build.7:227
#, no-wrap
-msgid "B</etc/live/build.d/>"
+msgid "B</etc/live/build/*>"
msgstr ""
diff --git a/manpages/pot/lb.1.pot b/manpages/pot/lb.1.pot
index ea8b9a3..f6da563 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: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-27 16:32+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at 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 "2012-08-10"
+msgid "2012-08-27"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a57-1"
+msgid "3.0~a58-1"
msgstr ""
#. type: TH
@@ -81,7 +81,7 @@ msgstr ""
#. type: SH
#: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:243 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:239 en/lb_source.1:9
#: en/lb_testroot.1:9 en/live-build.7:11
#, no-wrap
msgid "DESCRIPTION"
@@ -96,7 +96,7 @@ msgstr ""
#. type: SH
#: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:252 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:248 en/lb_source.1:14
#: en/lb_testroot.1:18 en/live-build.7:20
#, no-wrap
msgid "OPTIONS"
@@ -112,7 +112,7 @@ msgstr ""
#. type: SH
#: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:502 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
#: en/lb_testroot.1:21 en/live-build.7:225
#, no-wrap
msgid "FILES"
@@ -127,7 +127,7 @@ msgstr ""
#. type: SH
#: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:509 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
#: en/lb_testroot.1:24 en/live-build.7:229
#, no-wrap
msgid "SEE ALSO"
@@ -135,21 +135,21 @@ msgstr ""
#. type: Plain text
#: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:511 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:503 en/lb_source.1:22
#: en/lb_testroot.1:26
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
#: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:517 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
#: en/lb_testroot.1:28 en/live-build.7:235
msgid "This program is a part of live-build."
msgstr ""
#. type: SH
#: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:518 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
#: en/lb_testroot.1:29 en/live-build.7:236
#, no-wrap
msgid "HOMEPAGE"
@@ -157,7 +157,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:520 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
#: en/lb_testroot.1:31 en/live-build.7:238
msgid ""
"More information about live-build and the Debian Live project can be found "
@@ -167,7 +167,7 @@ msgstr ""
#. type: SH
#: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:521 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
#: en/lb_testroot.1:32 en/live-build.7:239
#, no-wrap
msgid "BUGS"
@@ -175,7 +175,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:523 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
#: en/lb_testroot.1:34 en/live-build.7:241
msgid ""
"Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -186,7 +186,7 @@ msgstr ""
#. type: SH
#: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:524 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
#: en/lb_testroot.1:35 en/live-build.7:242
#, no-wrap
msgid "AUTHOR"
@@ -194,7 +194,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:525 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
#: en/lb_testroot.1:36 en/live-build.7:243
msgid ""
"live-build was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
diff --git a/manpages/pot/lb_binary.1.pot b/manpages/pot/lb_binary.1.pot
index 380c65f..103e975 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: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-27 16:32+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at 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 "2012-08-10"
+msgid "2012-08-27"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a57-1"
+msgid "3.0~a58-1"
msgstr ""
#. type: TH
@@ -66,7 +66,7 @@ msgstr ""
#. type: SH
#: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:243 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:239 en/lb_source.1:9
#: en/lb_testroot.1:9 en/live-build.7:11
#, no-wrap
msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
#. type: SH
#: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:252 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:248 en/lb_source.1:14
#: en/lb_testroot.1:18 en/live-build.7:20
#, no-wrap
msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
#. type: SH
#: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:502 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
#: en/lb_testroot.1:21 en/live-build.7:225
#, no-wrap
msgid "FILES"
@@ -97,7 +97,7 @@ msgstr ""
#. type: SH
#: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:509 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
#: en/lb_testroot.1:24 en/live-build.7:229
#, no-wrap
msgid "SEE ALSO"
@@ -105,21 +105,21 @@ msgstr ""
#. type: Plain text
#: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:511 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:503 en/lb_source.1:22
#: en/lb_testroot.1:26
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
#: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:517 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
#: en/lb_testroot.1:28 en/live-build.7:235
msgid "This program is a part of live-build."
msgstr ""
#. type: SH
#: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:518 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
#: en/lb_testroot.1:29 en/live-build.7:236
#, no-wrap
msgid "HOMEPAGE"
@@ -127,7 +127,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:520 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
#: en/lb_testroot.1:31 en/live-build.7:238
msgid ""
"More information about live-build and the Debian Live project can be found "
@@ -137,7 +137,7 @@ msgstr ""
#. type: SH
#: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:521 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
#: en/lb_testroot.1:32 en/live-build.7:239
#, no-wrap
msgid "BUGS"
@@ -145,7 +145,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:523 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
#: en/lb_testroot.1:34 en/live-build.7:241
msgid ""
"Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -156,7 +156,7 @@ msgstr ""
#. type: SH
#: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:524 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
#: en/lb_testroot.1:35 en/live-build.7:242
#, no-wrap
msgid "AUTHOR"
@@ -164,7 +164,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:525 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
#: en/lb_testroot.1:36 en/live-build.7:243
msgid ""
"live-build was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
diff --git a/manpages/pot/lb_bootstrap.1.pot b/manpages/pot/lb_bootstrap.1.pot
index 39bb528..0bf59b0 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: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-27 16:32+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at 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 "2012-08-10"
+msgid "2012-08-27"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a57-1"
+msgid "3.0~a58-1"
msgstr ""
#. type: TH
@@ -66,7 +66,7 @@ msgstr ""
#. type: SH
#: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:243 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:239 en/lb_source.1:9
#: en/lb_testroot.1:9 en/live-build.7:11
#, no-wrap
msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
#. type: SH
#: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:252 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:248 en/lb_source.1:14
#: en/lb_testroot.1:18 en/live-build.7:20
#, no-wrap
msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
#. type: SH
#: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:502 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
#: en/lb_testroot.1:21 en/live-build.7:225
#, no-wrap
msgid "FILES"
@@ -97,7 +97,7 @@ msgstr ""
#. type: SH
#: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:509 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
#: en/lb_testroot.1:24 en/live-build.7:229
#, no-wrap
msgid "SEE ALSO"
@@ -105,21 +105,21 @@ msgstr ""
#. type: Plain text
#: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:511 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:503 en/lb_source.1:22
#: en/lb_testroot.1:26
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
#: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:517 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
#: en/lb_testroot.1:28 en/live-build.7:235
msgid "This program is a part of live-build."
msgstr ""
#. type: SH
#: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:518 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
#: en/lb_testroot.1:29 en/live-build.7:236
#, no-wrap
msgid "HOMEPAGE"
@@ -127,7 +127,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:520 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
#: en/lb_testroot.1:31 en/live-build.7:238
msgid ""
"More information about live-build and the Debian Live project can be found "
@@ -137,7 +137,7 @@ msgstr ""
#. type: SH
#: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:521 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
#: en/lb_testroot.1:32 en/live-build.7:239
#, no-wrap
msgid "BUGS"
@@ -145,7 +145,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:523 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
#: en/lb_testroot.1:34 en/live-build.7:241
msgid ""
"Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -156,7 +156,7 @@ msgstr ""
#. type: SH
#: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:524 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
#: en/lb_testroot.1:35 en/live-build.7:242
#, no-wrap
msgid "AUTHOR"
@@ -164,7 +164,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:525 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
#: en/lb_testroot.1:36 en/live-build.7:243
msgid ""
"live-build was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
diff --git a/manpages/pot/lb_build.1.pot b/manpages/pot/lb_build.1.pot
index c94055f..cbd9105 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: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-27 16:32+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at 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 "2012-08-10"
+msgid "2012-08-27"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a57-1"
+msgid "3.0~a58-1"
msgstr ""
#. type: TH
@@ -66,7 +66,7 @@ msgstr ""
#. type: SH
#: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:243 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:239 en/lb_source.1:9
#: en/lb_testroot.1:9 en/live-build.7:11
#, no-wrap
msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
#. type: SH
#: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:252 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:248 en/lb_source.1:14
#: en/lb_testroot.1:18 en/live-build.7:20
#, no-wrap
msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
#. type: SH
#: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:502 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
#: en/lb_testroot.1:21 en/live-build.7:225
#, no-wrap
msgid "FILES"
@@ -90,7 +90,7 @@ msgstr ""
#. type: SH
#: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:509 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
#: en/lb_testroot.1:24 en/live-build.7:229
#, no-wrap
msgid "SEE ALSO"
@@ -98,21 +98,21 @@ msgstr ""
#. type: Plain text
#: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:511 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:503 en/lb_source.1:22
#: en/lb_testroot.1:26
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
#: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:517 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
#: en/lb_testroot.1:28 en/live-build.7:235
msgid "This program is a part of live-build."
msgstr ""
#. type: SH
#: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:518 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
#: en/lb_testroot.1:29 en/live-build.7:236
#, no-wrap
msgid "HOMEPAGE"
@@ -120,7 +120,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:520 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
#: en/lb_testroot.1:31 en/live-build.7:238
msgid ""
"More information about live-build and the Debian Live project can be found "
@@ -130,7 +130,7 @@ msgstr ""
#. type: SH
#: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:521 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
#: en/lb_testroot.1:32 en/live-build.7:239
#, no-wrap
msgid "BUGS"
@@ -138,7 +138,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:523 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
#: en/lb_testroot.1:34 en/live-build.7:241
msgid ""
"Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -149,7 +149,7 @@ msgstr ""
#. type: SH
#: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:524 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
#: en/lb_testroot.1:35 en/live-build.7:242
#, no-wrap
msgid "AUTHOR"
@@ -157,7 +157,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:525 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
#: en/lb_testroot.1:36 en/live-build.7:243
msgid ""
"live-build was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
diff --git a/manpages/pot/lb_chroot.1.pot b/manpages/pot/lb_chroot.1.pot
index e357e08..747d70d 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: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-27 16:32+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at 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 "2012-08-10"
+msgid "2012-08-27"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a57-1"
+msgid "3.0~a58-1"
msgstr ""
#. type: TH
@@ -66,7 +66,7 @@ msgstr ""
#. type: SH
#: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:243 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:239 en/lb_source.1:9
#: en/lb_testroot.1:9 en/live-build.7:11
#, no-wrap
msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
#. type: SH
#: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:252 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:248 en/lb_source.1:14
#: en/lb_testroot.1:18 en/live-build.7:20
#, no-wrap
msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
#. type: SH
#: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:502 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
#: en/lb_testroot.1:21 en/live-build.7:225
#, no-wrap
msgid "FILES"
@@ -97,7 +97,7 @@ msgstr ""
#. type: SH
#: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:509 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
#: en/lb_testroot.1:24 en/live-build.7:229
#, no-wrap
msgid "SEE ALSO"
@@ -105,21 +105,21 @@ msgstr ""
#. type: Plain text
#: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:511 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:503 en/lb_source.1:22
#: en/lb_testroot.1:26
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
#: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:517 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
#: en/lb_testroot.1:28 en/live-build.7:235
msgid "This program is a part of live-build."
msgstr ""
#. type: SH
#: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:518 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
#: en/lb_testroot.1:29 en/live-build.7:236
#, no-wrap
msgid "HOMEPAGE"
@@ -127,7 +127,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:520 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
#: en/lb_testroot.1:31 en/live-build.7:238
msgid ""
"More information about live-build and the Debian Live project can be found "
@@ -137,7 +137,7 @@ msgstr ""
#. type: SH
#: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:521 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
#: en/lb_testroot.1:32 en/live-build.7:239
#, no-wrap
msgid "BUGS"
@@ -145,7 +145,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:523 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
#: en/lb_testroot.1:34 en/live-build.7:241
msgid ""
"Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -156,7 +156,7 @@ msgstr ""
#. type: SH
#: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:524 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
#: en/lb_testroot.1:35 en/live-build.7:242
#, no-wrap
msgid "AUTHOR"
@@ -164,7 +164,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:525 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
#: en/lb_testroot.1:36 en/live-build.7:243
msgid ""
"live-build was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
diff --git a/manpages/pot/lb_clean.1.pot b/manpages/pot/lb_clean.1.pot
index 1754746..0d9517a 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: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-27 16:32+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at 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 "2012-08-10"
+msgid "2012-08-27"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a57-1"
+msgid "3.0~a58-1"
msgstr ""
#. type: TH
@@ -66,7 +66,7 @@ msgstr ""
#. type: SH
#: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:243 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:239 en/lb_source.1:9
#: en/lb_testroot.1:9 en/live-build.7:11
#, no-wrap
msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
#. type: SH
#: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:252 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:248 en/lb_source.1:14
#: en/lb_testroot.1:18 en/live-build.7:20
#, no-wrap
msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
#. type: SH
#: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:502 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
#: en/lb_testroot.1:21 en/live-build.7:225
#, no-wrap
msgid "FILES"
@@ -90,7 +90,7 @@ msgstr ""
#. type: SH
#: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:509 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
#: en/lb_testroot.1:24 en/live-build.7:229
#, no-wrap
msgid "SEE ALSO"
@@ -98,21 +98,21 @@ msgstr ""
#. type: Plain text
#: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:511 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:503 en/lb_source.1:22
#: en/lb_testroot.1:26
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
#: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:517 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
#: en/lb_testroot.1:28 en/live-build.7:235
msgid "This program is a part of live-build."
msgstr ""
#. type: SH
#: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:518 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
#: en/lb_testroot.1:29 en/live-build.7:236
#, no-wrap
msgid "HOMEPAGE"
@@ -120,7 +120,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:520 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
#: en/lb_testroot.1:31 en/live-build.7:238
msgid ""
"More information about live-build and the Debian Live project can be found "
@@ -130,7 +130,7 @@ msgstr ""
#. type: SH
#: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:521 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
#: en/lb_testroot.1:32 en/live-build.7:239
#, no-wrap
msgid "BUGS"
@@ -138,7 +138,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:523 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
#: en/lb_testroot.1:34 en/live-build.7:241
msgid ""
"Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -149,7 +149,7 @@ msgstr ""
#. type: SH
#: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:524 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
#: en/lb_testroot.1:35 en/live-build.7:242
#, no-wrap
msgid "AUTHOR"
@@ -157,7 +157,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:525 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
#: en/lb_testroot.1:36 en/live-build.7:243
msgid ""
"live-build was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot
index 59499a3..e939137 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: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-27 16:32+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at 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 "2012-08-10"
+msgid "2012-08-27"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a57-1"
+msgid "3.0~a58-1"
msgstr ""
#. type: TH
@@ -66,7 +66,7 @@ msgstr ""
#. type: SH
#: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:243 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:239 en/lb_source.1:9
#: en/lb_testroot.1:9 en/live-build.7:11
#, no-wrap
msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
#. type: SH
#: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:252 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:248 en/lb_source.1:14
#: en/lb_testroot.1:18 en/live-build.7:20
#, no-wrap
msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
#. type: SH
#: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:502 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
#: en/lb_testroot.1:21 en/live-build.7:225
#, no-wrap
msgid "FILES"
@@ -90,7 +90,7 @@ msgstr ""
#. type: SH
#: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:509 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
#: en/lb_testroot.1:24 en/live-build.7:229
#, no-wrap
msgid "SEE ALSO"
@@ -98,21 +98,21 @@ msgstr ""
#. type: Plain text
#: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:511 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:503 en/lb_source.1:22
#: en/lb_testroot.1:26
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
#: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:517 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
#: en/lb_testroot.1:28 en/live-build.7:235
msgid "This program is a part of live-build."
msgstr ""
#. type: SH
#: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:518 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
#: en/lb_testroot.1:29 en/live-build.7:236
#, no-wrap
msgid "HOMEPAGE"
@@ -120,7 +120,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:520 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
#: en/lb_testroot.1:31 en/live-build.7:238
msgid ""
"More information about live-build and the Debian Live project can be found "
@@ -130,7 +130,7 @@ msgstr ""
#. type: SH
#: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:521 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
#: en/lb_testroot.1:32 en/live-build.7:239
#, no-wrap
msgid "BUGS"
@@ -138,7 +138,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:523 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
#: en/lb_testroot.1:34 en/live-build.7:241
msgid ""
"Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -149,7 +149,7 @@ msgstr ""
#. type: SH
#: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:524 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
#: en/lb_testroot.1:35 en/live-build.7:242
#, no-wrap
msgid "AUTHOR"
@@ -157,7 +157,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:525 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
#: en/lb_testroot.1:36 en/live-build.7:243
msgid ""
"live-build was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
@@ -267,500 +267,490 @@ msgstr ""
#. type: Plain text
#: en/lb_config.1:47
-msgid " [-f|B<--bootstrap-flavour> minimal|standard]"
-msgstr ""
-
-#. type: Plain text
-#: en/lb_config.1:49
-msgid " [B<--bootstrap-keyring> I<PACKAGE>]"
-msgstr ""
-
-#. type: Plain text
-#: en/lb_config.1:51
msgid " [B<--cache> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:53
+#: en/lb_config.1:49
msgid " [B<--cache-indices> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:55
+#: en/lb_config.1:51
msgid " [B<--cache-packages> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:57
+#: en/lb_config.1:53
msgid " [B<--cache-stages> I<STAGE>|I<\"STAGES\">]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:59
+#: en/lb_config.1:55
msgid " [B<--checksums> md5|sha1|sha256|none]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:61
+#: en/lb_config.1:57
msgid " [B<--compression> bzip2|gzip|lzip|none]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:63
+#: en/lb_config.1:59
msgid " [B<--config> I<GIT_URL::GIT_ID>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:65
+#: en/lb_config.1:61
msgid " [B<--build-with-chroot> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:67
+#: en/lb_config.1:63
msgid " [B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:69
+#: en/lb_config.1:65
msgid " [B<--clean>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:71
+#: en/lb_config.1:67
msgid " [-c|B<--conffile> I<FILE>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:73
+#: en/lb_config.1:69
msgid " [B<--debconf-frontend> dialog|editor|noninteractive|readline]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:75
+#: en/lb_config.1:71
msgid " [B<--debconf-nowarnings> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:77
+#: en/lb_config.1:73
msgid " [B<--debconf-priority> low|medium|high|critical]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:79
+#: en/lb_config.1:75
msgid ""
" [B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:81
+#: en/lb_config.1:77
msgid " [B<--debian-installer-distribution> daily|I<CODENAME>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:83
+#: en/lb_config.1:79
msgid " [B<--debian-installer-preseedfile> I<FILE>|I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:85
+#: en/lb_config.1:81
msgid " [B<--debian-installer-gui> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:87
+#: en/lb_config.1:83
msgid " [B<--debug>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:89
+#: en/lb_config.1:85
msgid " [-d|B<--distribution> I<CODENAME>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:91
+#: en/lb_config.1:87
msgid " [B<--parent-distribution> I<CODENAME>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:93
+#: en/lb_config.1:89
msgid " [B<--parent-debian-installer-distribution> I<CODENAME>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:95
+#: en/lb_config.1:91
msgid " [B<--dump>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:97
+#: en/lb_config.1:93
msgid " [B<--fdisk> fdisk|fdisk.dist]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:99
+#: en/lb_config.1:95
msgid " [B<--firmware-binary true|false>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:101
+#: en/lb_config.1:97
msgid " [B<--firmware-chroot true|false>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:103
+#: en/lb_config.1:99
msgid " [B<--force>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:105
+#: en/lb_config.1:101
msgid " [B<--grub-splash> I<FILE>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:107
+#: en/lb_config.1:103
msgid " [B<--gzip-options> I<OPTION>|\"I<OPTIONS>\"]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:109
+#: en/lb_config.1:105
msgid " [B<--hooks> I<FILE>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:111
+#: en/lb_config.1:107
msgid " [B<--ignore-system-defaults>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:113
+#: en/lb_config.1:109
msgid " [B<--initramfs> auto|none|live-boot|casper]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:115
+#: en/lb_config.1:111
msgid " [B<--initramfs-compression> bzip2|gzip|lzma]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:117
+#: en/lb_config.1:113
msgid " [B<--initsystem> sysvinit|runit|systemd|upstart|none]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:119
+#: en/lb_config.1:115
msgid " [B<--interactive> shell]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:121
+#: en/lb_config.1:117
msgid " [B<--isohybrid-options> I<OPTION>|\"I<OPTIONS>\"]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:123
+#: en/lb_config.1:119
msgid " [B<--iso-application> I<NAME>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:125
+#: en/lb_config.1:121
msgid " [B<--iso-preparer> I<NAME>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:127
+#: en/lb_config.1:123
msgid " [B<--iso-publisher> I<NAME>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:129
+#: en/lb_config.1:125
msgid " [B<--iso-volume> I<NAME>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:131
+#: en/lb_config.1:127
msgid " [B<--jffs2-eraseblock> I<SIZE>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:133
+#: en/lb_config.1:129
msgid " [B<--keyring-packages> I<PACKAGE|\"PACKAGES\">]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:135
+#: en/lb_config.1:131
msgid " [-k|B<--linux-flavours> I<FLAVOUR>|I<\"FLAVOURS\">]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:137
+#: en/lb_config.1:133
msgid " [B<--linux-packages> I<\"PACKAGES\">]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:139
+#: en/lb_config.1:135
msgid " [B<--losetup> losetup|losetup.orig]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:141
+#: en/lb_config.1:137
msgid " [B<--memtest> memtest86+|memtest86|none]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:143
+#: en/lb_config.1:139
msgid " [-m|B<--parent-mirror-bootstrap> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:145
+#: en/lb_config.1:141
msgid " [B<--parent-mirror-chroot> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:147
+#: en/lb_config.1:143
msgid " [B<--parent-mirror-chroot-security> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:149
+#: en/lb_config.1:145
msgid " [B<--parent-mirror-chroot-volatile> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:151
+#: en/lb_config.1:147
msgid " [B<--parent-mirror-chroot-backports> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:153
+#: en/lb_config.1:149
msgid " [B<--parent-mirror-binary> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:155
+#: en/lb_config.1:151
msgid " [B<--parent-mirror-binary-security> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:157
+#: en/lb_config.1:153
msgid " [B<--parent-mirror-binary-volatile> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:159
+#: en/lb_config.1:155
msgid " [B<--parent-mirror-binary-backports> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:161
+#: en/lb_config.1:157
msgid " [B<--parent-mirror-debian-installer> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:163
+#: en/lb_config.1:159
msgid " [B<--mirror-bootstrap> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:165
+#: en/lb_config.1:161
msgid " [B<--mirror-chroot> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:167
+#: en/lb_config.1:163
msgid " [B<--mirror-chroot-security> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:169
+#: en/lb_config.1:165
msgid " [B<--mirror-chroot-volatile> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:171
+#: en/lb_config.1:167
msgid " [B<--mirror-chroot-backports> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:173
+#: en/lb_config.1:169
msgid " [B<--mirror-binary> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:175
+#: en/lb_config.1:171
msgid " [B<--mirror-binary-security> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:177
+#: en/lb_config.1:173
msgid " [B<--mirror-binary-volatile> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:179
+#: en/lb_config.1:175
msgid " [B<--mirror-binary-backports> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:181
+#: en/lb_config.1:177
msgid " [B<--mirror-debian-installer> I<URL>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:183
+#: en/lb_config.1:179
msgid " [B<--mode> debian|emdebian|progress|ubuntu|kubuntu]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:185
+#: en/lb_config.1:181
msgid " [B<--system> live|normal]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:187
+#: en/lb_config.1:183
msgid " [B<--net-root-filesystem> nfs|cfs]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:189
+#: en/lb_config.1:185
msgid " [B<--net-root-mountoptions> I<OPTIONS>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:191
+#: en/lb_config.1:187
msgid " [B<--net-root-path> I<PATH>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:193
+#: en/lb_config.1:189
msgid " [B<--net-root-server> I<IP>|I<HOSTNAME>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:195
+#: en/lb_config.1:191
msgid " [B<--net-cow-filesystem> nfs|cfs]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:197
+#: en/lb_config.1:193
msgid " [B<--net-cow-mountoptions> I<OPTIONS>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:199
+#: en/lb_config.1:195
msgid " [B<--net-cow-path> I<PATH>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:201
+#: en/lb_config.1:197
msgid " [B<--net-cow-server> I<IP>|I<HOSTNAME>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:203
+#: en/lb_config.1:199
msgid " [B<--net-tarball> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:205
+#: en/lb_config.1:201
msgid " [-p|B<--package-lists> I<LIST>|I<\"LISTS\">]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:207
+#: en/lb_config.1:203
msgid " [B<--quiet>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:209
+#: en/lb_config.1:205
msgid " [B<--root-command> sudo]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:211
+#: en/lb_config.1:207
msgid " [B<--use-fakeroot> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:213
+#: en/lb_config.1:209
msgid " [B<--archives> I<ARCHIVE>|I<\"ARCHIVES\">]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:215
+#: en/lb_config.1:211
msgid " [B<--archive-areas> I<ARCHIVE_AREA>|I<\"ARCHIVE_AREAS\">]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:217
+#: en/lb_config.1:213
msgid ""
" [B<--parent-archive-areas> I<PARENT_ARCHIVE_AREA>|I<\"PARENT_ARCHIVE_AREAS"
"\">]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:219
+#: en/lb_config.1:215
msgid " [B<--security> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:221
+#: en/lb_config.1:217
msgid " [B<--source> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:223
+#: en/lb_config.1:219
msgid " [-s|B<--source-images> iso|netboot|tar|hdd]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:225
+#: en/lb_config.1:221
msgid " [B<--syslinux-theme> I<THEME_SUFFIX>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:227
+#: en/lb_config.1:223
msgid " [B<--tasksel> apt|aptitude|tasksel]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:229
+#: en/lb_config.1:225
msgid " [B<--templates> I<PATH>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:231
+#: en/lb_config.1:227
msgid " [B<--hdd-size >I<MB>]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:233
+#: en/lb_config.1:229
msgid " [B<--volatile> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:235
+#: en/lb_config.1:231
msgid " [B<--backports> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:237
+#: en/lb_config.1:233
msgid " [B<--exposed-root> true|false]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:239
+#: en/lb_config.1:235
msgid " [B<--verbose>]"
msgstr ""
#. FIXME
#. type: Plain text
-#: en/lb_config.1:242
+#: en/lb_config.1:238
msgid " [B<--win32-loader true|false]>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:245
+#: en/lb_config.1:241
msgid ""
"B<lb config> is a high-level command (porcelain) of I<live-build>(7), the "
"Debian Live tool suite."
@@ -768,7 +758,7 @@ msgstr ""
#. FIXME
#. type: Plain text
-#: en/lb_config.1:248
+#: en/lb_config.1:244
msgid ""
"B<lb config> populates the configuration directory for live-build. By "
"default, this directory is named 'config' and is created in the current "
@@ -777,7 +767,7 @@ msgstr ""
#. FIXME
#. type: Plain text
-#: en/lb_config.1:251
+#: en/lb_config.1:247
msgid ""
"Note: Currently B<lb config> tries to be smart and sets defaults for some "
"options depending on the setting of other options (e.g. which linux packages "
@@ -793,7 +783,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:254
+#: en/lb_config.1:250
msgid ""
"In addition to its specific options B<lb config> understands all generic "
"live-build options. See I<live-build>(7) for a complete list of all generic "
@@ -802,26 +792,26 @@ msgstr ""
#. FIXME
#. type: IP
-#: en/lb_config.1:256
+#: en/lb_config.1:252
#, no-wrap
msgid "B<--apt> apt|aptitude"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:258
+#: en/lb_config.1:254
msgid ""
"defines if apt-get or aptitude is used to install packages when building the "
"image. The default is apt."
msgstr ""
#. type: IP
-#: en/lb_config.1:258
+#: en/lb_config.1:254
#, no-wrap
msgid "B<--apt-ftp-proxy> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:260
+#: en/lb_config.1:256
msgid ""
"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 "
@@ -829,13 +819,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:260
+#: en/lb_config.1:256
#, no-wrap
msgid "B<--apt-http-proxy> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:262
+#: en/lb_config.1:258
msgid ""
"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 "
@@ -843,26 +833,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:262
+#: en/lb_config.1:258
#, no-wrap
msgid "B<--apt-indices> true|false|none"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:264
+#: en/lb_config.1:260
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."
msgstr ""
#. type: IP
-#: en/lb_config.1:264
+#: en/lb_config.1:260
#, no-wrap
msgid "B<--apt-options> I<OPTION>|\"I<OPTIONS>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:266
+#: en/lb_config.1:262
msgid ""
"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 "
@@ -870,13 +860,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:266
+#: en/lb_config.1:262
#, no-wrap
msgid "B<--aptitude-options> I<OPTION>|\"I<OPTIONS>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:268
+#: en/lb_config.1:264
msgid ""
"defines the default options that will be appended to every aptitude call "
"that is made inside chroot during building of the image. By default, this is "
@@ -884,13 +874,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:268
+#: en/lb_config.1:264
#, no-wrap
msgid "B<--apt-pipeline> I<DEPTH>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:270
+#: en/lb_config.1:266
msgid ""
"sets the depth of the apt/aptitude pipeline. In cases where the remote "
"server is not RFC conforming or buggy (such as Squid 2.0.2) this option can "
@@ -902,51 +892,51 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:270
+#: en/lb_config.1:266
#, no-wrap
msgid "B<--apt-recommends> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:272
+#: en/lb_config.1:268
msgid ""
"defines if apt should install recommended packages automatically. By "
"default, this is true except in emdebian mode."
msgstr ""
#. type: IP
-#: en/lb_config.1:272
+#: en/lb_config.1:268
#, no-wrap
msgid "B<--apt-secure> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:274
+#: en/lb_config.1:270
msgid ""
"defines if apt should check repository signatures. This is true by default."
msgstr ""
#. type: IP
-#: en/lb_config.1:274
+#: en/lb_config.1:270
#, no-wrap
msgid "B<--apt-source-archives> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:276
+#: en/lb_config.1:272
msgid ""
"defines if deb-src entries should be included in the resulting live image or "
"not, defaults to on."
msgstr ""
#. type: IP
-#: en/lb_config.1:276
+#: en/lb_config.1:272
#, no-wrap
msgid "-a|B<--architectures> I<ARCHITECTURE>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:278
+#: en/lb_config.1:274
msgid ""
"defines the architecture of the to be build image. By default, this is set "
"to the host architecture. Note that you cannot crossbuild for another "
@@ -957,13 +947,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:278
+#: en/lb_config.1:274
#, no-wrap
msgid "-b|B<--binary-images> iso|iso-hybrid|netboot|tar|hdd"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:280
+#: en/lb_config.1:276
msgid ""
"defines the image type to build. By default, for images using syslinux this "
"is set to iso-hybrid to build CD/DVD images that may also be used like hdd "
@@ -971,13 +961,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:280
+#: en/lb_config.1:276
#, no-wrap
msgid "B<--binary-filesystem> fat16|fat32|ext2|ext3|ext4"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:282
+#: en/lb_config.1:278
msgid ""
"defines the filesystem to be used in the image type. This only has an effect "
"if the selected binary image type does allow to choose a filesystem. For "
@@ -990,24 +980,24 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:282
+#: en/lb_config.1:278
#, no-wrap
msgid "B<--bootappend-install> I<PARAMETER>|\"I<PARAMETERS>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:284
+#: en/lb_config.1:280
msgid "sets boot parameters specific to debian-installer, if included."
msgstr ""
#. type: IP
-#: en/lb_config.1:284
+#: en/lb_config.1:280
#, no-wrap
msgid "B<--bootappend-live> I<PARAMETER>|\"I<PARAMETERS>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:286
+#: en/lb_config.1:282
msgid ""
"sets boot parameters specific to debian-live. A complete list of boot "
"parameters can be found in the I<live-boot>(7) and I<live-config>(7) manual "
@@ -1015,13 +1005,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:286
+#: en/lb_config.1:282
#, no-wrap
msgid "B<--bootloader> grub|syslinux|yaboot"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:288
+#: en/lb_config.1:284
msgid ""
"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 "
@@ -1034,13 +1024,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:288
+#: en/lb_config.1:284
#, no-wrap
msgid "B<--bootstrap> cdebootstrap|cdebootstrap-static|debootstrap|copy"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:290
+#: en/lb_config.1:286
msgid ""
"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 "
@@ -1050,53 +1040,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:290
-#, no-wrap
-msgid "-f|B<--bootstrap-flavour> minimal|standard"
-msgstr ""
-
-#. type: Plain text
-#: en/lb_config.1:292
-msgid ""
-"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)."
-msgstr ""
-
-#. type: IP
-#: en/lb_config.1:292
-#, no-wrap
-msgid "B<--bootstrap-keyring> I<PACKAGE>"
-msgstr ""
-
-#. type: Plain text
-#: en/lb_config.1:294
-msgid ""
-"sets the archive keyring package to be used. Default is debian-archive-"
-"keyring."
-msgstr ""
-
-#. type: IP
-#: en/lb_config.1:294
+#: en/lb_config.1:286
#, no-wrap
msgid "B<--cache> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:296
+#: en/lb_config.1:288
msgid ""
"defines globally if any cache should be used at all. Different caches can be "
"controled through the their own options."
msgstr ""
#. type: IP
-#: en/lb_config.1:296
+#: en/lb_config.1:288
#, no-wrap
msgid "B<--cache-indices> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:298
+#: en/lb_config.1:290
msgid ""
"defines if downloaded package indices and lists should be cached which is "
"false by default. Enabling it would allow to rebuild an image completely "
@@ -1104,13 +1067,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:298
+#: en/lb_config.1:290
#, no-wrap
msgid "B<--cache-packages> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:300
+#: en/lb_config.1:292
msgid ""
"defines if downloaded packages files should be cached which is true by "
"default. Disabling it does save space consumtion in your build directory, "
@@ -1121,13 +1084,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:300
+#: en/lb_config.1:292
#, no-wrap
msgid "B<--cache-stages> true|false|I<STAGE>|\"I<STAGES>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:302
+#: en/lb_config.1:294
msgid ""
"sets which stages should be cached. By default set to bootstrap. As an "
"exception to the normal stage names, also rootfs can be used here which does "
@@ -1137,13 +1100,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:302
+#: en/lb_config.1:294
#, no-wrap
msgid "B<--checksums> md5|sha1|sha256|none"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:304
+#: en/lb_config.1:296
msgid ""
"defines if the binary image should contain a file called md5sums.txt, "
"sha1sums.txt and/or sha256sums.txt. These lists all files on the image "
@@ -1155,39 +1118,39 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:304
+#: en/lb_config.1:296
#, no-wrap
msgid "B<--compression> bzip2|gzip|lzip|none"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:306
+#: en/lb_config.1:298
msgid ""
"defines the compression program to be used to compress tarballs. Defaults to "
"gzip."
msgstr ""
#. type: IP
-#: en/lb_config.1:306
+#: en/lb_config.1:298
#, no-wrap
msgid "B<--config> I<GIT_URL>::I<GIT_ID>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:308
+#: en/lb_config.1:300
msgid ""
"allows to bootstrap a config tree from a git repositories, optionally "
"appended by a Git Id (branch, commit, tag, etc.)."
msgstr ""
#. type: IP
-#: en/lb_config.1:308
+#: en/lb_config.1:300
#, no-wrap
msgid "B<--build-with-chroot> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:310
+#: en/lb_config.1:302
msgid ""
"defines whetever live-build should use the tools from within the chroot to "
"build the binary image or not by using and including the host systems tools. "
@@ -1202,13 +1165,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:310
+#: en/lb_config.1:302
#, no-wrap
msgid "B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:312
+#: en/lb_config.1:304
msgid ""
"defines which filesystem type should be used for the root filesystem image. "
"If you use none, then no filesystem image is created and the root filesystem "
@@ -1219,39 +1182,39 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:312
+#: en/lb_config.1:304
#, no-wrap
msgid "B<--clean>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:314
+#: en/lb_config.1:306
msgid ""
"minimizes config directory by automatically removing unused and thus empty "
"subdirectories."
msgstr ""
#. type: IP
-#: en/lb_config.1:314
+#: en/lb_config.1:306
#, no-wrap
msgid "-c|B<--conffile> I<FILE>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:316
+#: en/lb_config.1:308
msgid ""
"using a user specified alternative configuration file in addition to the "
"normally used one in the config directory."
msgstr ""
#. type: IP
-#: en/lb_config.1:316
+#: en/lb_config.1:308
#, no-wrap
msgid "B<--debconf-frontend> dialog|editor|noninteractive|readline"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:318
+#: en/lb_config.1:310
msgid ""
"defines what value the debconf frontend should be set to inside the chroot. "
"Note that setting it to anything by noninteractive, which is the default, "
@@ -1259,13 +1222,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:318
+#: en/lb_config.1:310
#, no-wrap
msgid "B<--debconf-nowarnings> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:320
+#: en/lb_config.1:312
msgid ""
"defines if warnings of debconf should be displayed or not. Warnings from "
"debconf are generally very rare and by default, we skip them, if any, in "
@@ -1273,13 +1236,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:320
+#: en/lb_config.1:312
#, no-wrap
msgid "B<--debconf-priority> low|medium|high|critical"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:322
+#: en/lb_config.1:314
msgid ""
"defines what value the debconf priority shoul dbe set to inside the chroot. "
"By default, it is set to critical, which means that almost no questions are "
@@ -1288,13 +1251,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:322
+#: en/lb_config.1:314
#, no-wrap
msgid "B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:324
+#: en/lb_config.1:316
msgid ""
"defines which type, if any, of the debian-installer should be included in "
"the resulting binary image. By default, no installer is included. All "
@@ -1306,13 +1269,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:324
+#: en/lb_config.1:316
#, no-wrap
msgid "B<--debian-installer-distribution> daily|I<CODENAME>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:326
+#: en/lb_config.1:318
msgid ""
"defines the distribution where the debian-installer files should be taken "
"out from. Normally, this should be set to the same distribution as the live "
@@ -1321,13 +1284,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:326
+#: en/lb_config.1:318
#, no-wrap
msgid "B<--debian-installer-preseedfile> I<FILE>|I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:328
+#: en/lb_config.1:320
msgid ""
"sets the filename or URL for an optionally used and included preseeding file "
"for debian-installer. If config/binary_debian-installer/preseed.cfg exists, "
@@ -1335,13 +1298,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:328
+#: en/lb_config.1:320
#, no-wrap
msgid "B<--debian-installer-gui> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:330
+#: en/lb_config.1:322
msgid ""
"defines if the debian-installer graphical GTK interface should be true or "
"not. In Debian mode and for most versions of Ubuntu, this option is true, "
@@ -1349,60 +1312,60 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:330 en/live-build.7:36
+#: en/lb_config.1:322 en/live-build.7:36
#, no-wrap
msgid "B<--debug>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:332
+#: en/lb_config.1:324
msgid "turn on debugging informational messages."
msgstr ""
#. type: IP
-#: en/lb_config.1:332
+#: en/lb_config.1:324
#, no-wrap
msgid "-d|B<--distribution> I<CODENAME>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:334
+#: en/lb_config.1:326
msgid "defines the distribution of the resulting live system."
msgstr ""
#. type: IP
-#: en/lb_config.1:334
+#: en/lb_config.1:326
#, no-wrap
msgid "-d|B<--parent-distribution> I<CODENAME>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:336
+#: en/lb_config.1:328
msgid ""
"defines the parent distribution for derivatives of the resulting live system."
msgstr ""
#. type: IP
-#: en/lb_config.1:336
+#: en/lb_config.1:328
#, no-wrap
msgid "-d|B<--parent-debian-installer-distribution> I<CODENAME>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:338
+#: en/lb_config.1:330
msgid ""
"defines the parent debian-installer distribution for derivatives of the "
"resulting live system."
msgstr ""
#. type: IP
-#: en/lb_config.1:338
+#: en/lb_config.1:330
#, no-wrap
msgid "B<--dump>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:340
+#: en/lb_config.1:332
msgid ""
"prepares a report of the currently present live system configuration and the "
"version of live-build used. This is useful to provide if you submit bug "
@@ -1411,26 +1374,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:340
+#: en/lb_config.1:332
#, no-wrap
msgid "B<--fdisk> fdisk|fdisk.dist"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:342
+#: en/lb_config.1:334
msgid ""
"sets the filename of the fdisk binary from the host system that should be "
"used. This is autodetected and does generally not need any customization."
msgstr ""
#. type: IP
-#: en/lb_config.1:342 en/live-build.7:38
+#: en/lb_config.1:334 en/live-build.7:38
#, no-wrap
msgid "B<--force>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:344
+#: en/lb_config.1:336
msgid ""
"forces re-execution of already run stages. Use only if you know what you are "
"doing. It is generally safer to use B<lb clean> to clean up before re-"
@@ -1438,26 +1401,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:344
+#: en/lb_config.1:336
#, no-wrap
msgid "B<--grub-splash> I<FILE>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:346
+#: en/lb_config.1:338
msgid ""
"defines the name of an optional to be included splash screen graphic for the "
"grub bootloader."
msgstr ""
#. type: IP
-#: en/lb_config.1:346
+#: en/lb_config.1:338
#, no-wrap
msgid "B<--gzip-options> I<OPTION>|\"I<OPTIONS>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:348
+#: en/lb_config.1:340
msgid ""
"defines the default options that will be appended to (almost) every gzip "
"call during the building of the image. By default, this is set to --best to "
@@ -1466,13 +1429,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:348
+#: en/lb_config.1:340
#, no-wrap
msgid "B<--hooks> I<FILE>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:350
+#: en/lb_config.1:342
msgid ""
"defines which hooks available in /usr/share/live/build/examples/hooks should "
"be activated. Normally, there are no hooks executed. Make sure you know and "
@@ -1480,28 +1443,28 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:350
+#: en/lb_config.1:342
#, no-wrap
msgid "B<--ignore-system-defaults>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:352
+#: en/lb_config.1:344
msgid ""
-"B<lb config> by default reads system defaults from /etc/live/build.conf and /"
-"etc/live/build.d when generating a new live system config directory. This is "
-"useful if you want to set global settings, such as mirror locations, and "
-"don't want to specify them all of the time."
+"B<lb config> by default reads system defaults from I</etc/live/build.conf> "
+"and I</etc/live/build/*> when generating a new live system config directory. "
+"This is useful if you want to set global settings, such as mirror locations, "
+"and don't want to specify them all of the time."
msgstr ""
#. type: IP
-#: en/lb_config.1:352
+#: en/lb_config.1:344
#, no-wrap
msgid "B<--initramfs> auto|none|live-boot|casper"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:354
+#: en/lb_config.1:346
msgid ""
"sets the name of package that contains the live system specific initramfs "
"modification. By default, auto is used, which means that at build time of "
@@ -1512,26 +1475,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:354
+#: en/lb_config.1:346
#, no-wrap
msgid "B<--initramfs-compression> bzip2|gzip|lzma]"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:356
+#: en/lb_config.1:348
msgid ""
"defines the compression program to be used to compress the initramfs. "
"Defaults to gzip."
msgstr ""
#. type: IP
-#: en/lb_config.1:356
+#: en/lb_config.1:348
#, no-wrap
msgid "B<--interactive> shell"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:358
+#: en/lb_config.1:350
msgid ""
"defines if after the chroot stage and before the beginning of the binary "
"stage, a interactive shell login should be spawned in the chroot in order to "
@@ -1545,24 +1508,24 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:358
+#: en/lb_config.1:350
#, no-wrap
msgid "B<--isohybrid-options> I<OPTION>|\"I<OPTIONS>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:360
+#: en/lb_config.1:352
msgid "defines options to pass to isohybrid."
msgstr ""
#. type: IP
-#: en/lb_config.1:360
+#: en/lb_config.1:352
#, no-wrap
msgid "B<--iso-application> I<NAME>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:362
+#: en/lb_config.1:354
msgid ""
"sets the APPLICATION field in the header of a resulting CD/DVD image and "
"defaults to \"Debian Live\" in debian mode, and to \"Emdebian Live\" in "
@@ -1570,13 +1533,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:362
+#: en/lb_config.1:354
#, no-wrap
msgid "B<--iso-preparer> I<NAME>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:364
+#: en/lb_config.1:356
msgid ""
"sets the PREPARER field in the header of a resulting CD/DVD image. By "
"default this is set to \"live-build I<VERSION>; http://packages.qa.debian."
@@ -1585,13 +1548,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:364
+#: en/lb_config.1:356
#, no-wrap
msgid "B<--iso-publisher> I<NAME>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:366
+#: en/lb_config.1:358
msgid ""
"sets the PUBLISHED field in the header of a resulting CD/DVD image. By "
"default, this is set to 'Debian Live project; http:/live.debian.net/; debian-"
@@ -1600,13 +1563,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:366
+#: en/lb_config.1:358
#, no-wrap
msgid "B<--iso-volume> I<NAME>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:368
+#: en/lb_config.1:360
msgid ""
"sets the VOLUME field in the header of a resulting CD/DVD and defaults to "
"'(I<MODE>) (I<DISTRIBUTION>) (I<DATE>)' whereas MODE is expanded to the name "
@@ -1615,13 +1578,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:368
+#: en/lb_config.1:360
#, no-wrap
msgid "B<--jffs2-eraseblock> I<SIZE>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:370
+#: en/lb_config.1:362
msgid ""
"sets the eraseblock size for a JFFS2 (Second Journalling Flash File System) "
"filesystem. The default is 64 KiB. If you use an erase block size different "
@@ -1631,39 +1594,39 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:370
+#: en/lb_config.1:362
#, no-wrap
msgid "B<--keyring-packages> I<PACKAGE|\"PACKAGES>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:372
+#: en/lb_config.1:364
msgid ""
"sets the keyring package or additional keyring packages. By default this is "
"set to debian-archive-keyring."
msgstr ""
#. type: IP
-#: en/lb_config.1:372
+#: en/lb_config.1:364
#, no-wrap
msgid "-k|B<--linux-flavours> I<FLAVOUR>|\"I<FLAVOURS>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:374
+#: en/lb_config.1:366
msgid ""
"sets the kernel flavours to be installed. Note that in case you specify more "
"than that the first will be configured the default kernel that gets booted."
msgstr ""
#. type: IP
-#: en/lb_config.1:374
+#: en/lb_config.1:366
#, no-wrap
msgid "B<--linux-packages> \"I<PACKAGES>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:376
+#: en/lb_config.1:368
msgid ""
"sets the internal name of the kernel packages naming scheme. If you use "
"debian kernel packages, you will not have to adjust it. If you decide to use "
@@ -1677,26 +1640,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:376
+#: en/lb_config.1:368
#, no-wrap
msgid "B<--losetup> losetup|losetup.orig"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:378
+#: en/lb_config.1:370
msgid ""
"sets the filename of the losetup binary from the host system that should be "
"used. This is autodetected and does generally not need any customization."
msgstr ""
#. type: IP
-#: en/lb_config.1:378
+#: en/lb_config.1:370
#, no-wrap
msgid "B<--memtest> memtest86+|memtest86|none"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:380
+#: en/lb_config.1:372
msgid ""
"defines if memtest, memtest86+ or no memory tester at all should be included "
"as secondary bootloader configuration. This is only available on amd64 and "
@@ -1704,13 +1667,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:380
+#: en/lb_config.1:372
#, no-wrap
msgid "-m|B<--parent-mirror-bootstrap> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:382
+#: en/lb_config.1:374
msgid ""
"sets the location of the debian package mirror that should be used to "
"bootstrap from. This defaults to http://ftp.de.debian.org/debian/ which may "
@@ -1718,13 +1681,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:382
+#: en/lb_config.1:374
#, no-wrap
msgid "B<--parent-mirror-chroot> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:384
+#: en/lb_config.1:376
msgid ""
"sets the location of the debian package mirror that will be used to fetch "
"the packages in order to build the live system. By default, this is set to "
@@ -1732,13 +1695,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:384
+#: en/lb_config.1:376
#, no-wrap
msgid "B<--parent-mirror-chroot-security> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:386
+#: en/lb_config.1:378
msgid ""
"sets the location of the debian security package mirror that will be used to "
"fetch the packages in order to build the live system. By default, this "
@@ -1746,13 +1709,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:386
+#: en/lb_config.1:378
#, no-wrap
msgid "B<--parent-mirror-chroot-volatile> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:388
+#: en/lb_config.1:380
msgid ""
"sets the location of the debian volatile package mirror that will be used to "
"fetch packages in order to build the live system. By default, this is set to "
@@ -1760,13 +1723,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:388
+#: en/lb_config.1:380
#, no-wrap
msgid "B<--parent-mirror-chroot-backports> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:390
+#: en/lb_config.1:382
msgid ""
"sets the location of the debian backports package mirror that will be used "
"to fetch packages in order to build the live system. By default, this points "
@@ -1774,43 +1737,43 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:390
+#: en/lb_config.1:382
#, no-wrap
msgid "B<--parent-mirror-binary> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:392
+#: en/lb_config.1:384
msgid ""
"sets the location of the debian package mirror that should end up configured "
"in the final image and which is the one a user would see and use. This has "
"not necessarily to be the same that is used to build the image, e.g. if you "
"use a local mirror but want to have an official mirror in the image. By "
-"default, 'http://cdn.debian.net/debian/' is used."
+"default, 'http://http.debian.net/debian/' is used."
msgstr ""
#. type: IP
-#: en/lb_config.1:392
+#: en/lb_config.1:384
#, no-wrap
msgid "B<--parent-mirror-binary-security> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:394
+#: en/lb_config.1:386
msgid ""
"sets the location of the debian security package mirror that should end up "
-"configured in the final image. By default, 'http://cdn.debian.net/debian-"
-"security/' is used."
+"configured in the final image. By default, 'http://security.debian.org/' is "
+"used."
msgstr ""
#. type: IP
-#: en/lb_config.1:394
+#: en/lb_config.1:386
#, no-wrap
msgid "B<--parent-mirror-binary-volatile> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:396
+#: en/lb_config.1:388
msgid ""
"sets the location of the debian volatile package mirror that should end up "
"configured in the final image. By default, the value of --parent-mirror-"
@@ -1818,13 +1781,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:396
+#: en/lb_config.1:388
#, no-wrap
msgid "B<--parent-mirror-binary-backports> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:398
+#: en/lb_config.1:390
msgid ""
"sets the location of the debian backports package mirror that should end up "
"configured in the final image. By default, 'http://backports.debian.org/"
@@ -1832,13 +1795,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:398
+#: en/lb_config.1:390
#, no-wrap
msgid "B<--parent-mirror-debian-installer> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:400
+#: en/lb_config.1:392
msgid ""
"sets the location of the mirror that will be used to fetch the debian "
"installer images. By default, this points to the same mirror used to build "
@@ -1846,13 +1809,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:400
+#: en/lb_config.1:392
#, no-wrap
msgid "B<--mirror-bootstrap> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:402
+#: en/lb_config.1:394
msgid ""
"sets the location of the debian package mirror that should be used to "
"bootstrap the derivative from. This defaults to http://ftp.de.debian.org/"
@@ -1860,13 +1823,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:402
+#: en/lb_config.1:394
#, no-wrap
msgid "B<--mirror-chroot> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:404
+#: en/lb_config.1:396
msgid ""
"sets the location of the debian package mirror that will be used to fetch "
"the packages of the derivative in order to build the live system. By "
@@ -1874,13 +1837,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:404
+#: en/lb_config.1:396
#, no-wrap
msgid "B<--mirror-chroot-security> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:406
+#: en/lb_config.1:398
msgid ""
"sets the location of the debian security package mirror that will be used to "
"fetch the packages of the derivative in order to build the live system. By "
@@ -1888,13 +1851,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:406
+#: en/lb_config.1:398
#, no-wrap
msgid "B<--mirror-chroot-volatile> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:408
+#: en/lb_config.1:400
msgid ""
"sets the location of the debian volatile package mirror that will be used to "
"fetch packages of the derivative in order to build the live system. By "
@@ -1902,13 +1865,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:408
+#: en/lb_config.1:400
#, no-wrap
msgid "B<--mirror-chroot-backports> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:410
+#: en/lb_config.1:402
msgid ""
"sets the location of the debian backports package mirror that will be used "
"to fetch packages of the derivative in order to build the live system. By "
@@ -1916,13 +1879,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:410
+#: en/lb_config.1:402
#, no-wrap
msgid "B<--mirror-binary> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:412
+#: en/lb_config.1:404
msgid ""
"sets the location of the derivative package mirror that should end up "
"configured in the final image and which is the one a user would see and use. "
@@ -1932,52 +1895,52 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:412
+#: en/lb_config.1:404
#, no-wrap
msgid "B<--mirror-binary-security> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:414
+#: en/lb_config.1:406
msgid ""
"sets the location of the derivatives security package mirror that should end "
"up configured in the final image."
msgstr ""
#. type: IP
-#: en/lb_config.1:414
+#: en/lb_config.1:406
#, no-wrap
msgid "B<--mirror-binary-volatile> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:416
+#: en/lb_config.1:408
msgid ""
"sets the location of the derivatives volatile package mirror that should end "
"up configured in the final image."
msgstr ""
#. type: IP
-#: en/lb_config.1:416
+#: en/lb_config.1:408
#, no-wrap
msgid "B<--mirror-binary-backports> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:418
+#: en/lb_config.1:410
msgid ""
"sets the location of the derivatives backports package mirror that should "
"end up configured in the final image."
msgstr ""
#. type: IP
-#: en/lb_config.1:418
+#: en/lb_config.1:410
#, no-wrap
msgid "B<--mirror-debian-installer> I<URL>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:420
+#: en/lb_config.1:412
msgid ""
"sets the location of the mirror that will be used to fetch the debian "
"installer images of the derivative. By default, this points to the same "
@@ -1985,65 +1948,65 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:420
+#: en/lb_config.1:412
#, no-wrap
msgid "B<--mode> debian|emdebian|progress|ubuntu"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:422
+#: en/lb_config.1:414
msgid ""
"defines a global mode to load project specific defaults. By default this is "
"set to debian."
msgstr ""
#. type: IP
-#: en/lb_config.1:422
+#: en/lb_config.1:414
#, no-wrap
msgid "B<--system> live|normal"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:424
+#: en/lb_config.1:416
msgid ""
"defines if the resulting system image should a live system or a normal, non-"
"live system."
msgstr ""
#. type: IP
-#: en/lb_config.1:424
+#: en/lb_config.1:416
#, no-wrap
msgid "B<--net-root-filesystem> nfs|cfs"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:426
+#: en/lb_config.1:418
msgid ""
"defines the filesystem that will be configured in the bootloader "
"configuration for your netboot image. This defaults to nfs."
msgstr ""
#. type: IP
-#: en/lb_config.1:426
+#: en/lb_config.1:418
#, no-wrap
msgid "B<--net-root-mountoptions> I<OPTIONS>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:428
+#: en/lb_config.1:420
msgid ""
"sets additional options for mounting the root filesystem in netboot images "
"and is by default empty."
msgstr ""
#. type: IP
-#: en/lb_config.1:428
+#: en/lb_config.1:420
#, no-wrap
msgid "B<--net-root-path> I<PATH>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:430
+#: en/lb_config.1:422
msgid ""
"sets the file path that will be configured in the bootloader configuration "
"for your netboot image. This defaults to /srv/debian-live in debian mode and "
@@ -2052,13 +2015,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:430
+#: en/lb_config.1:422
#, no-wrap
msgid "B<--net-root-server> I<IP>|I<HOSTNAME>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:432
+#: en/lb_config.1:424
msgid ""
"sets the IP or hostname that will be configured in the bootloader "
"configuration for the root filesystem of your netboot image. This defaults "
@@ -2066,38 +2029,38 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:432
+#: en/lb_config.1:424
#, no-wrap
msgid "B<--net-cow-filesystem> nfs|cfs"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:434
+#: en/lb_config.1:426
msgid ""
"defines the filesystem type for the copy-on-write layer and defaults to nfs."
msgstr ""
#. type: IP
-#: en/lb_config.1:434
+#: en/lb_config.1:426
#, no-wrap
msgid "B<--net-cow-mountoptions> I<OPTIONS>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:436
+#: en/lb_config.1:428
msgid ""
"sets additional options for mounting the copy-on-write layer in netboot "
"images and is by default empty."
msgstr ""
#. type: IP
-#: en/lb_config.1:436
+#: en/lb_config.1:428
#, no-wrap
msgid "B<--net-cow-path> I<PATH>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:438
+#: en/lb_config.1:430
msgid ""
"defines the path to client writable filesystem. Anywhere that "
"I<client_mac_address> is specified in the path live-boot will substitute the "
@@ -2105,28 +2068,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:441
+#: en/lb_config.1:433
msgid "Example:"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:443
+#: en/lb_config.1:435
msgid "/export/hosts/client_mac_address"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:445
+#: en/lb_config.1:437
msgid "/export/hosts/00-16-D3-33-92-E8"
msgstr ""
#. type: IP
-#: en/lb_config.1:445
+#: en/lb_config.1:437
#, no-wrap
msgid "B<--net-cow-server> I<IP>|I<HOSTNAME>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:447
+#: en/lb_config.1:439
msgid ""
"sets the IP or hostname that will be configured in the bootloader "
"configuration for the copy-on-write filesystem of your netboot image and is "
@@ -2134,13 +2097,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:447
+#: en/lb_config.1:439
#, no-wrap
msgid "B<--net-tarball> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:449
+#: en/lb_config.1:441
msgid ""
"defines if a compressed tarball should be created. Disabling this options "
"leads to no tarball at all, the plain binary directory is considered the "
@@ -2148,13 +2111,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:449
+#: en/lb_config.1:441
#, no-wrap
msgid "-p|B<--package-lists> I<LIST>|\"I<LISTS>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:451
+#: en/lb_config.1:443
msgid ""
"defines which lists available in /usr/share/live/build/package-lists should "
"be used. By default, this is set to standard. Note that in case you have "
@@ -2164,37 +2127,37 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:451 en/live-build.7:40
+#: en/lb_config.1:443 en/live-build.7:40
#, no-wrap
msgid "B<--quiet>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:453
+#: en/lb_config.1:445
msgid "reduces the verbosity of messages output by B<lb build>."
msgstr ""
#. type: IP
-#: en/lb_config.1:453
+#: en/lb_config.1:445
#, no-wrap
msgid "B<--archives> I<ARCHIVE>|\"I<ARCHIVES>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:455
+#: en/lb_config.1:447
msgid ""
"enables one of available third-party archive configurations in /usr/share/"
"live/build/archives."
msgstr ""
#. type: IP
-#: en/lb_config.1:455
+#: en/lb_config.1:447
#, no-wrap
msgid "B<--root-command> sudo"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:457
+#: en/lb_config.1:449
msgid ""
"controls if live-build should use sudo internally to build the live image. "
"Note that this is not well tested and that you should, when relying on sudo, "
@@ -2202,13 +2165,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:457
+#: en/lb_config.1:449
#, no-wrap
msgid "B<--use-fakeroot> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:459
+#: en/lb_config.1:451
msgid ""
"controls if live-build should utilize fakeroot and fakechroot to try and "
"avoid requiring root privillages where possible. By default, this option is "
@@ -2216,13 +2179,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:459
+#: en/lb_config.1:451
#, no-wrap
msgid "B<--archive-areas> I<ARCHIVE_AREA>|\"I<ARCHIVE_AREAS>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:461
+#: en/lb_config.1:453
msgid ""
"defines which package archive areas of a debian packages archive should be "
"used for configured debian package mirrors. By default, this is set to main. "
@@ -2232,37 +2195,37 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:461
+#: en/lb_config.1:453
#, no-wrap
msgid "B<--parent-archive-areas> I<PARENT_ARCHIVE_AREA>|\"I<PARENT_ARCHIVE_AREAS>\""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:463
+#: en/lb_config.1:455
msgid "defines the archive areas for derivatives of the resulting live system."
msgstr ""
#. type: IP
-#: en/lb_config.1:463
+#: en/lb_config.1:455
#, no-wrap
msgid "B<--security> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:465
+#: en/lb_config.1:457
msgid ""
"defines if the security repositories specified in the security mirror "
"options should be used or not."
msgstr ""
#. type: IP
-#: en/lb_config.1:465
+#: en/lb_config.1:457
#, no-wrap
msgid "B<--source> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:467
+#: en/lb_config.1:459
msgid ""
"defines if a corresponding source image to the binary image should be build. "
"By default this is false because most people do not require this and would "
@@ -2272,24 +2235,24 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:467
+#: en/lb_config.1:459
#, no-wrap
msgid "-s|B<--source-images> iso|netboot|tar|hdd"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:469
+#: en/lb_config.1:461
msgid "defines the image type for the source image. Default is tar."
msgstr ""
#. type: IP
-#: en/lb_config.1:469
+#: en/lb_config.1:461
#, no-wrap
msgid "B<--firmware-binary> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:471
+#: en/lb_config.1:463
msgid ""
"defines if firmware packages should be automatically included into the "
"binary pool for debian-installer. Note that only firmware packages available "
@@ -2300,13 +2263,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:471
+#: en/lb_config.1:463
#, no-wrap
msgid "B<--firmware-chroot> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:473
+#: en/lb_config.1:465
msgid ""
"defines if firmware packages should be automatically included into the live "
"image. Note that only firmware packages available within the configured "
@@ -2316,39 +2279,39 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:473
+#: en/lb_config.1:465
#, no-wrap
msgid "B<--swap-file-path> I<PATH>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:475
+#: en/lb_config.1:467
msgid ""
"defines the path to a swap file to create in the binary image. Default is "
"not to create a swap file."
msgstr ""
#. type: IP
-#: en/lb_config.1:475
+#: en/lb_config.1:467
#, no-wrap
msgid "B<--swap-file-size> I<MB>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:477
+#: en/lb_config.1:469
msgid ""
"defines what size in megabytes the swap file should be, if one is to be "
"created. Default is 512MB."
msgstr ""
#. type: IP
-#: en/lb_config.1:477
+#: en/lb_config.1:469
#, no-wrap
msgid "B<--syslinux-theme> I<THEME_SUFFIX>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:479
+#: en/lb_config.1:471
msgid ""
"defines the syslinux theme to use. The theme suffix is the name of a "
"directory in /usr/share/syslinux/themes/ provided by a package named "
@@ -2357,39 +2320,39 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:479
+#: en/lb_config.1:471
#, no-wrap
msgid "B<--tasksel> apt|aptitude|tasksel"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:481
+#: en/lb_config.1:473
msgid ""
"selects which program is used to install tasks. By default, this is set to "
"tasksel."
msgstr ""
#. type: IP
-#: en/lb_config.1:481
+#: en/lb_config.1:473
#, no-wrap
msgid "B<--templates> I<PATH>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:483
+#: en/lb_config.1:475
msgid ""
"sets the path to the templates that live-build is going to use, e.g. for "
"bootloaders. By default, this is set to /usr/share/live/build/templates/."
msgstr ""
#. type: IP
-#: en/lb_config.1:483
+#: en/lb_config.1:475
#, no-wrap
msgid "B<--hdd-size> MB"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:485
+#: en/lb_config.1:477
msgid ""
"defines what size the hdd image should be. Note that although the default is "
"set to 10000 (= 10GB), it will not need 10GB space on your harddisk as the "
@@ -2397,39 +2360,39 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:485
+#: en/lb_config.1:477
#, no-wrap
msgid "B<--volatile> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:487
+#: en/lb_config.1:479
msgid ""
"defines if debian volatile package archives should be included in the image "
"or not."
msgstr ""
#. type: IP
-#: en/lb_config.1:487
+#: en/lb_config.1:479
#, no-wrap
msgid "B<--backports> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:489
+#: en/lb_config.1:481
msgid ""
"defines if debian backports package archives should be included in the image "
"or not."
msgstr ""
#. type: IP
-#: en/lb_config.1:489
+#: en/lb_config.1:481
#, no-wrap
msgid "B<--exposed-root> true|false"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:491
+#: en/lb_config.1:483
msgid ""
"defines whether to expose the root filesystem as read only and not covered "
"by the union filesystem. This has useful implications for certain speciality "
@@ -2437,37 +2400,37 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:491 en/live-build.7:42
+#: en/lb_config.1:483 en/live-build.7:42
#, no-wrap
msgid "B<--verbose>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:493
+#: en/lb_config.1:485
msgid "increases the verbosity of messages output by B<lb build>."
msgstr ""
#. type: IP
-#: en/lb_config.1:493
+#: en/lb_config.1:485
#, no-wrap
msgid "B<--win32-loader true|false>"
msgstr ""
#. FIXME
#. type: Plain text
-#: en/lb_config.1:496
+#: en/lb_config.1:488
msgid "defines if win32-loader should be included in the binary image or not."
msgstr ""
#. type: SH
-#: en/lb_config.1:497
+#: en/lb_config.1:489
#, no-wrap
msgid "ENVIRONMENT"
msgstr ""
#. FIXME
#. type: Plain text
-#: en/lb_config.1:500
+#: en/lb_config.1:492
msgid ""
"Currently, command line switches can also be specified through the "
"corresponding environment variable. However, this generally should not be "
@@ -2481,20 +2444,20 @@ msgstr ""
#. FIXME
#. type: IP
-#: en/lb_config.1:504
+#: en/lb_config.1:496
#, no-wrap
msgid "B<auto/config>"
msgstr ""
#. type: IP
-#: en/lb_config.1:505
+#: en/lb_config.1:497
#, no-wrap
-msgid "B</etc/live/build.conf, /etc/live/build.d>"
+msgid "B</etc/live/build.conf, /etc/live/build/*>"
msgstr ""
#. FIXME
#. type: Plain text
-#: en/lb_config.1:508
+#: en/lb_config.1:500
msgid ""
"An optional, global configuration file for B<lb config> variables. It is "
"useful to specify a few system wide defaults, like "
@@ -2503,11 +2466,11 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/lb_config.1:513 en/live-build.7:231
+#: en/lb_config.1:505 en/live-build.7:231
msgid "I<live-boot>(7)"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:515 en/live-build.7:233
+#: en/lb_config.1:507 en/live-build.7:233
msgid "I<live-config>(7)"
msgstr ""
diff --git a/manpages/pot/lb_source.1.pot b/manpages/pot/lb_source.1.pot
index 105fcf1..91c1f95 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: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-27 16:32+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at 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 "2012-08-10"
+msgid "2012-08-27"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a57-1"
+msgid "3.0~a58-1"
msgstr ""
#. type: TH
@@ -66,7 +66,7 @@ msgstr ""
#. type: SH
#: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:243 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:239 en/lb_source.1:9
#: en/lb_testroot.1:9 en/live-build.7:11
#, no-wrap
msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
#. type: SH
#: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:252 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:248 en/lb_source.1:14
#: en/lb_testroot.1:18 en/live-build.7:20
#, no-wrap
msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
#. type: SH
#: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:502 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
#: en/lb_testroot.1:21 en/live-build.7:225
#, no-wrap
msgid "FILES"
@@ -97,7 +97,7 @@ msgstr ""
#. type: SH
#: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:509 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
#: en/lb_testroot.1:24 en/live-build.7:229
#, no-wrap
msgid "SEE ALSO"
@@ -105,21 +105,21 @@ msgstr ""
#. type: Plain text
#: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:511 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:503 en/lb_source.1:22
#: en/lb_testroot.1:26
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
#: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:517 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
#: en/lb_testroot.1:28 en/live-build.7:235
msgid "This program is a part of live-build."
msgstr ""
#. type: SH
#: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:518 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
#: en/lb_testroot.1:29 en/live-build.7:236
#, no-wrap
msgid "HOMEPAGE"
@@ -127,7 +127,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:520 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
#: en/lb_testroot.1:31 en/live-build.7:238
msgid ""
"More information about live-build and the Debian Live project can be found "
@@ -137,7 +137,7 @@ msgstr ""
#. type: SH
#: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:521 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
#: en/lb_testroot.1:32 en/live-build.7:239
#, no-wrap
msgid "BUGS"
@@ -145,7 +145,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:523 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
#: en/lb_testroot.1:34 en/live-build.7:241
msgid ""
"Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -156,7 +156,7 @@ msgstr ""
#. type: SH
#: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:524 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
#: en/lb_testroot.1:35 en/live-build.7:242
#, no-wrap
msgid "AUTHOR"
@@ -164,7 +164,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:525 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
#: en/lb_testroot.1:36 en/live-build.7:243
msgid ""
"live-build was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
diff --git a/manpages/pot/lb_testroot.1.pot b/manpages/pot/lb_testroot.1.pot
index eeb2709..a55397e 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: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-27 16:32+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at 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 "2012-08-10"
+msgid "2012-08-27"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a57-1"
+msgid "3.0~a58-1"
msgstr ""
#. type: TH
@@ -66,7 +66,7 @@ msgstr ""
#. type: SH
#: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:243 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:239 en/lb_source.1:9
#: en/lb_testroot.1:9 en/live-build.7:11
#, no-wrap
msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
#. type: SH
#: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:252 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:248 en/lb_source.1:14
#: en/lb_testroot.1:18 en/live-build.7:20
#, no-wrap
msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
#. type: SH
#: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:502 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
#: en/lb_testroot.1:21 en/live-build.7:225
#, no-wrap
msgid "FILES"
@@ -97,7 +97,7 @@ msgstr ""
#. type: SH
#: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:509 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
#: en/lb_testroot.1:24 en/live-build.7:229
#, no-wrap
msgid "SEE ALSO"
@@ -105,21 +105,21 @@ msgstr ""
#. type: Plain text
#: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:511 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:503 en/lb_source.1:22
#: en/lb_testroot.1:26
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
#: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:517 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
#: en/lb_testroot.1:28 en/live-build.7:235
msgid "This program is a part of live-build."
msgstr ""
#. type: SH
#: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:518 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
#: en/lb_testroot.1:29 en/live-build.7:236
#, no-wrap
msgid "HOMEPAGE"
@@ -127,7 +127,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:520 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
#: en/lb_testroot.1:31 en/live-build.7:238
msgid ""
"More information about live-build and the Debian Live project can be found "
@@ -137,7 +137,7 @@ msgstr ""
#. type: SH
#: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:521 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
#: en/lb_testroot.1:32 en/live-build.7:239
#, no-wrap
msgid "BUGS"
@@ -145,7 +145,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:523 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
#: en/lb_testroot.1:34 en/live-build.7:241
msgid ""
"Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -156,7 +156,7 @@ msgstr ""
#. type: SH
#: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:524 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
#: en/lb_testroot.1:35 en/live-build.7:242
#, no-wrap
msgid "AUTHOR"
@@ -164,7 +164,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:525 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
#: en/lb_testroot.1:36 en/live-build.7:243
msgid ""
"live-build was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
diff --git a/manpages/pot/live-build.7.pot b/manpages/pot/live-build.7.pot
index 5a096d1..ea7c718 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: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-27 16:32+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at 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 "2012-08-10"
+msgid "2012-08-27"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a57-1"
+msgid "3.0~a58-1"
msgstr ""
#. type: TH
@@ -66,7 +66,7 @@ msgstr ""
#. type: SH
#: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:243 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:239 en/lb_source.1:9
#: en/lb_testroot.1:9 en/live-build.7:11
#, no-wrap
msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
#. type: SH
#: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:252 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:248 en/lb_source.1:14
#: en/lb_testroot.1:18 en/live-build.7:20
#, no-wrap
msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
#. type: SH
#: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:502 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
#: en/lb_testroot.1:21 en/live-build.7:225
#, no-wrap
msgid "FILES"
@@ -90,7 +90,7 @@ msgstr ""
#. type: SH
#: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:509 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
#: en/lb_testroot.1:24 en/live-build.7:229
#, no-wrap
msgid "SEE ALSO"
@@ -98,14 +98,14 @@ msgstr ""
#. type: Plain text
#: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:517 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
#: en/lb_testroot.1:28 en/live-build.7:235
msgid "This program is a part of live-build."
msgstr ""
#. type: SH
#: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:518 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
#: en/lb_testroot.1:29 en/live-build.7:236
#, no-wrap
msgid "HOMEPAGE"
@@ -113,7 +113,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:520 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
#: en/lb_testroot.1:31 en/live-build.7:238
msgid ""
"More information about live-build and the Debian Live project can be found "
@@ -123,7 +123,7 @@ msgstr ""
#. type: SH
#: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:521 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
#: en/lb_testroot.1:32 en/live-build.7:239
#, no-wrap
msgid "BUGS"
@@ -131,7 +131,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:523 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
#: en/lb_testroot.1:34 en/live-build.7:241
msgid ""
"Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -142,7 +142,7 @@ msgstr ""
#. type: SH
#: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:524 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
#: en/lb_testroot.1:35 en/live-build.7:242
#, no-wrap
msgid "AUTHOR"
@@ -150,7 +150,7 @@ msgstr ""
#. type: Plain text
#: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:525 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
#: en/lb_testroot.1:36 en/live-build.7:243
msgid ""
"live-build was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
@@ -158,36 +158,36 @@ msgid ""
msgstr ""
#. type: IP
-#: en/lb_config.1:330 en/live-build.7:36
+#: en/lb_config.1:322 en/live-build.7:36
#, no-wrap
msgid "B<--debug>"
msgstr ""
#. type: IP
-#: en/lb_config.1:342 en/live-build.7:38
+#: en/lb_config.1:334 en/live-build.7:38
#, no-wrap
msgid "B<--force>"
msgstr ""
#. type: IP
-#: en/lb_config.1:451 en/live-build.7:40
+#: en/lb_config.1:443 en/live-build.7:40
#, no-wrap
msgid "B<--quiet>"
msgstr ""
#. type: IP
-#: en/lb_config.1:491 en/live-build.7:42
+#: en/lb_config.1:483 en/live-build.7:42
#, no-wrap
msgid "B<--verbose>"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:513 en/live-build.7:231
+#: en/lb_config.1:505 en/live-build.7:231
msgid "I<live-boot>(7)"
msgstr ""
#. type: Plain text
-#: en/lb_config.1:515 en/live-build.7:233
+#: en/lb_config.1:507 en/live-build.7:233
msgid "I<live-config>(7)"
msgstr ""
@@ -1269,5 +1269,5 @@ msgstr ""
#. type: IP
#: en/live-build.7:227
#, no-wrap
-msgid "B</etc/live/build.d/>"
+msgid "B</etc/live/build/*>"
msgstr ""
diff --git a/scripts/build.sh b/scripts/build.sh
index fbe3e92..b8846a4 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -3,8 +3,7 @@
if [ -e local/live-build ]
then
LIVE_BUILD="${LIVE_BUILD:-${PWD}/local/live-build}"
- PATH="${PWD}/local/live-build/scripts/build:${PATH}"
- export LIVE_BUILD PATH
+ export LIVE_BUILD
fi
# Source global functions
diff --git a/scripts/build/binary b/scripts/build/binary
new file mode 100755
index 0000000..4fbbc09
--- /dev/null
+++ b/scripts/build/binary
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
+##
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
+set -e
+
+# Including common functions
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
+
+# Automatically populating config tree
+if [ -x auto/config ] && [ ! -e .build/config ]
+then
+ Echo_message "Automatically populating config tree."
+ lb config
+fi
+
+# Setting static variables
+DESCRIPTION="$(Echo 'build binary images')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Setup cleanup function
+Setup_cleanup
+
+# Preparing root filesystem
+lb binary_chroot ${@}
+
+if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
+then
+ # Configuring chroot
+ lb chroot_devpts install ${@}
+ lb chroot_proc install ${@}
+ lb chroot_selinuxfs install ${@}
+ lb chroot_sysfs install ${@}
+ lb chroot_hosts install ${@}
+ lb chroot_resolv install ${@}
+ lb chroot_hostname install ${@}
+ lb chroot_sysv-rc install ${@}
+ lb chroot_upstart install ${@}
+ lb chroot_apt install-binary ${@}
+ lb chroot_archives chroot install ${@}
+fi
+
+# Building root filesystem
+lb binary_rootfs ${@}
+lb binary_manifest ${@}
+
+# Prepare images
+lb binary_package-lists ${@}
+lb binary_linux-image ${@}
+lb binary_debian-installer ${@}
+lb binary_memtest ${@}
+lb binary_grub ${@}
+lb binary_grub2 ${@}
+lb binary_syslinux ${@}
+lb binary_yaboot ${@}
+lb binary_silo ${@}
+lb binary_disk ${@}
+lb binary_win32-loader ${@}
+lb binary_includes ${@}
+lb binary_hooks ${@}
+lb binary_checksums ${@}
+
+if [ "${LB_BUILD_WITH_CHROOT}" != "true" ]
+then
+ lb chroot_devpts install ${@}
+ lb chroot_proc install ${@}
+ lb chroot_selinuxfs install ${@}
+ lb chroot_sysfs install ${@}
+fi
+
+# Building images
+lb binary_iso ${@}
+lb binary_netboot ${@}
+lb binary_tar ${@}
+lb binary_hdd ${@}
+lb binary_virtual-hdd ${@}
+
+lb binary_zsync ${@}
+
+if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
+then
+ # Deconfiguring chroot
+ rm -f .build/chroot_archives
+ lb chroot_apt remove ${@}
+ lb chroot_hostname remove ${@}
+ lb chroot_resolv remove ${@}
+ lb chroot_hosts remove ${@}
+ lb chroot_upstart remove ${@}
+ lb chroot_sysv-rc remove ${@}
+ lb chroot_dpkg remove ${@}
+ lb chroot_debianchroot remove ${@}
+fi
+
+lb chroot_sysfs remove ${@}
+lb chroot_selinuxfs remove ${@}
+lb chroot_proc remove ${@}
+lb chroot_devpts remove ${@}
diff --git a/scripts/build/lb_binary_checksums b/scripts/build/binary_checksums
similarity index 94%
rename from scripts/build/lb_binary_checksums
rename to scripts/build/binary_checksums
index 7e9cda0..e6ece14 100755
--- a/scripts/build/lb_binary_checksums
+++ b/scripts/build/binary_checksums
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'create binary checksums')"
diff --git a/scripts/build/lb_binary_chroot b/scripts/build/binary_chroot
similarity index 96%
rename from scripts/build/lb_binary_chroot
rename to scripts/build/binary_chroot
index a39691c..4d4500e 100755
--- a/scripts/build/lb_binary_chroot
+++ b/scripts/build/binary_chroot
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'copy chroot into chroot')"
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/binary_debian-installer
similarity index 99%
rename from scripts/build/lb_binary_debian-installer
rename to scripts/build/binary_debian-installer
index 667887a..a6ed88b 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/binary_debian-installer
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'install debian-installer into binary')"
diff --git a/scripts/build/lb_binary_disk b/scripts/build/binary_disk
similarity index 97%
rename from scripts/build/lb_binary_disk
rename to scripts/build/binary_disk
index ce11019..e8e5c0d 100755
--- a/scripts/build/lb_binary_disk
+++ b/scripts/build/binary_disk
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'install disk information into binary')"
diff --git a/scripts/build/lb_binary_grub b/scripts/build/binary_grub
similarity index 98%
rename from scripts/build/lb_binary_grub
rename to scripts/build/binary_grub
index 5e1b2f7..1dd1201 100755
--- a/scripts/build/lb_binary_grub
+++ b/scripts/build/binary_grub
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'installs grub into binary')"
diff --git a/scripts/build/lb_binary_grub2 b/scripts/build/binary_grub2
similarity index 98%
rename from scripts/build/lb_binary_grub2
rename to scripts/build/binary_grub2
index c524282..738f280 100755
--- a/scripts/build/lb_binary_grub2
+++ b/scripts/build/binary_grub2
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'installs grub2 into binary')"
diff --git a/scripts/build/lb_binary_hdd b/scripts/build/binary_hdd
similarity index 98%
rename from scripts/build/lb_binary_hdd
rename to scripts/build/binary_hdd
index b924e2f..4dd515f 100755
--- a/scripts/build/lb_binary_hdd
+++ b/scripts/build/binary_hdd
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build binary image')"
diff --git a/scripts/build/lb_binary_hooks b/scripts/build/binary_hooks
similarity index 79%
rename from scripts/build/lb_binary_hooks
rename to scripts/build/binary_hooks
index 8018f79..cd1270b 100755
--- a/scripts/build/lb_binary_hooks
+++ b/scripts/build/binary_hooks
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'execute hooks in binary')"
@@ -43,17 +43,18 @@ Create_lockfile .lock
# Running hooks
for _HOOK in ${LB_BINARY_HOOKS}
do
- for LOCATION in "${LIVE_BUILD}/hooks" /usr/share/live/build/hooks
+ for LOCATION in "${LIVE_BUILD}/hooks" /usr/share/live/build/hooks
+ do
+ for FILE in "${LOCATION}"/???-"${_HOOK}".binary
do
- if [ -e "${LOCATION}/hooks/???-${_HOOK}.binary" ]
+ if [ -e "${FILE}" ]
then
cd binary
- ./"${LOCATION}/hooks/???-${_HOOK}.binary" || { Echo_error "${_HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;}
+ ./"${FILE}" || { Echo_error "${_HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;}
cd "${OLDPWD}"
-
- continue
fi
done
+ done
done
## Processing local hooks
diff --git a/scripts/build/lb_binary_includes b/scripts/build/binary_includes
similarity index 92%
rename from scripts/build/lb_binary_includes
rename to scripts/build/binary_includes
index c727395..f1f345a 100755
--- a/scripts/build/lb_binary_includes
+++ b/scripts/build/binary_includes
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'copy files into binary')"
diff --git a/scripts/build/lb_binary_iso b/scripts/build/binary_iso
similarity index 98%
rename from scripts/build/lb_binary_iso
rename to scripts/build/binary_iso
index d466656..c25674b 100755
--- a/scripts/build/lb_binary_iso
+++ b/scripts/build/binary_iso
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build iso binary image')"
diff --git a/scripts/build/lb_binary_linux-image b/scripts/build/binary_linux-image
similarity index 94%
rename from scripts/build/lb_binary_linux-image
rename to scripts/build/binary_linux-image
index e36b54b..94afac8 100755
--- a/scripts/build/lb_binary_linux-image
+++ b/scripts/build/binary_linux-image
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'install linux-image into binary')"
diff --git a/scripts/build/lb_binary_manifest b/scripts/build/binary_manifest
similarity index 93%
rename from scripts/build/lb_binary_manifest
rename to scripts/build/binary_manifest
index 383aa07..b62a437 100755
--- a/scripts/build/lb_binary_manifest
+++ b/scripts/build/binary_manifest
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'create manifest')"
diff --git a/scripts/build/lb_binary_memtest b/scripts/build/binary_memtest
similarity index 95%
rename from scripts/build/lb_binary_memtest
rename to scripts/build/binary_memtest
index 8b8700a..d96c778 100755
--- a/scripts/build/lb_binary_memtest
+++ b/scripts/build/binary_memtest
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'installs a memtest into binary')"
diff --git a/scripts/build/lb_binary_netboot b/scripts/build/binary_netboot
similarity index 97%
rename from scripts/build/lb_binary_netboot
rename to scripts/build/binary_netboot
index 0b01121..08cc9d3 100755
--- a/scripts/build/lb_binary_netboot
+++ b/scripts/build/binary_netboot
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build netboot binary image')"
diff --git a/scripts/build/lb_binary_package-lists b/scripts/build/binary_package-lists
similarity index 97%
rename from scripts/build/lb_binary_package-lists
rename to scripts/build/binary_package-lists
index b3414ef..8671678 100755
--- a/scripts/build/lb_binary_package-lists
+++ b/scripts/build/binary_package-lists
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'install local packages into binary')"
diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/binary_rootfs
similarity index 75%
rename from scripts/build/lb_binary_rootfs
rename to scripts/build/binary_rootfs
index 860b600..6704b52 100755
--- a/scripts/build/lb_binary_rootfs
+++ b/scripts/build/binary_rootfs
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build rootfs image')"
@@ -157,36 +157,36 @@ case "${LB_CHROOT_FILESYSTEM}" in
rm -f .lock
mv chroot/chroot chroot.tmp
- lb chroot_archives binary remove ${*}
- lb chroot_apt remove ${*}
- lb chroot_hostname remove ${*}
- lb chroot_resolv remove ${*}
- lb chroot_hosts remove ${*}
- lb chroot_sysv-rc remove ${*}
- lb chroot_upstart remove ${*}
- lb chroot_dpkg remove ${*}
- lb chroot_debianchroot remove ${*}
- lb chroot_sysfs remove ${*}
- lb chroot_selinuxfs remove ${*}
- lb chroot_proc remove ${*}
- lb chroot_devpts remove ${*}
+ lb chroot_archives binary remove ${@}
+ lb chroot_apt remove ${@}
+ lb chroot_hostname remove ${@}
+ lb chroot_resolv remove ${@}
+ lb chroot_hosts remove ${@}
+ lb chroot_sysv-rc remove ${@}
+ lb chroot_upstart remove ${@}
+ lb chroot_dpkg remove ${@}
+ lb chroot_debianchroot remove ${@}
+ lb chroot_sysfs remove ${@}
+ lb chroot_selinuxfs remove ${@}
+ lb chroot_proc remove ${@}
+ lb chroot_devpts remove ${@}
rm -rf chroot
mv chroot.tmp chroot
- lb chroot_devpts install ${*}
- lb chroot_proc install ${*}
- lb chroot_selinuxfs install ${*}
- lb chroot_sysfs install ${*}
- lb chroot_debianchroot install ${*}
- lb chroot_dpkg install ${*}
- lb chroot_sysv-rc install ${*}
- lb chroot_upstart install ${*}
- lb chroot_hosts install ${*}
- lb chroot_resolv install ${*}
- lb chroot_hostname install ${*}
- lb chroot_apt install ${*}
- lb chroot_archives binary install ${*}
+ lb chroot_devpts install ${@}
+ lb chroot_proc install ${@}
+ lb chroot_selinuxfs install ${@}
+ lb chroot_sysfs install ${@}
+ lb chroot_debianchroot install ${@}
+ lb chroot_dpkg install ${@}
+ lb chroot_sysv-rc install ${@}
+ lb chroot_upstart install ${@}
+ lb chroot_hosts install ${@}
+ lb chroot_resolv install ${@}
+ lb chroot_hostname install ${@}
+ lb chroot_apt install ${@}
+ lb chroot_archives binary install ${@}
touch .lock
else
@@ -247,36 +247,36 @@ case "${LB_CHROOT_FILESYSTEM}" in
rm -f .lock
mv chroot/chroot chroot.tmp
- lb chroot_archives binary remove ${*}
- lb chroot_apt remove ${*}
- lb chroot_hostname remove ${*}
- lb chroot_resolv remove ${*}
- lb chroot_hosts remove ${*}
- lb chroot_sysv-rc remove ${*}
- lb chroot_upstart remove ${*}
- lb chroot_dpkg remove ${*}
- lb chroot_debianchroot remove ${*}
- lb chroot_sysfs remove ${*}
- lb chroot_selinuxfs remove ${*}
- lb chroot_proc remove ${*}
- lb chroot_devpts remove ${*}
+ lb chroot_archives binary remove ${@}
+ lb chroot_apt remove ${@}
+ lb chroot_hostname remove ${@}
+ lb chroot_resolv remove ${@}
+ lb chroot_hosts remove ${@}
+ lb chroot_sysv-rc remove ${@}
+ lb chroot_upstart remove ${@}
+ lb chroot_dpkg remove ${@}
+ lb chroot_debianchroot remove ${@}
+ lb chroot_sysfs remove ${@}
+ lb chroot_selinuxfs remove ${@}
+ lb chroot_proc remove ${@}
+ lb chroot_devpts remove ${@}
rm -rf chroot
mv chroot.tmp chroot
- lb chroot_devpts install ${*}
- lb chroot_proc install ${*}
- lb chroot_selinuxfs install ${*}
- lb chroot_sysfs install ${*}
- lb chroot_debianchroot install ${*}
- lb chroot_dpkg install ${*}
- lb chroot_sysv-rc install ${*}
- lb chroot_upstart install ${*}
- lb chroot_hosts install ${*}
- lb chroot_resolv install ${*}
- lb chroot_hostname install ${*}
- lb chroot_apt install ${*}
- lb chroot_archives binary install ${*}
+ lb chroot_devpts install ${@}
+ lb chroot_proc install ${@}
+ lb chroot_selinuxfs install ${@}
+ lb chroot_sysfs install ${@}
+ lb chroot_debianchroot install ${@}
+ lb chroot_dpkg install ${@}
+ lb chroot_sysv-rc install ${@}
+ lb chroot_upstart install ${@}
+ lb chroot_hosts install ${@}
+ lb chroot_resolv install ${@}
+ lb chroot_hostname install ${@}
+ lb chroot_apt install ${@}
+ lb chroot_archives binary install ${@}
touch .lock
else
@@ -397,36 +397,36 @@ case "${LB_CHROOT_FILESYSTEM}" in
rm -f .lock
mv chroot/chroot chroot.tmp
- lb chroot_archives binary remove ${*}
- lb chroot_apt remove ${*}
- lb chroot_hostname remove ${*}
- lb chroot_resolv remove ${*}
- lb chroot_hosts remove ${*}
- lb chroot_sysv-rc remove ${*}
- lb chroot_upstart remove ${*}
- lb chroot_dpkg remove ${*}
- lb chroot_debianchroot remove ${*}
- lb chroot_sysfs remove ${*}
- lb chroot_selinuxfs remove ${*}
- lb chroot_proc remove ${*}
- lb chroot_devpts remove ${*}
+ lb chroot_archives binary remove ${@}
+ lb chroot_apt remove ${@}
+ lb chroot_hostname remove ${@}
+ lb chroot_resolv remove ${@}
+ lb chroot_hosts remove ${@}
+ lb chroot_sysv-rc remove ${@}
+ lb chroot_upstart remove ${@}
+ lb chroot_dpkg remove ${@}
+ lb chroot_debianchroot remove ${@}
+ lb chroot_sysfs remove ${@}
+ lb chroot_selinuxfs remove ${@}
+ lb chroot_proc remove ${@}
+ lb chroot_devpts remove ${@}
rm -rf chroot
mv chroot.tmp chroot
- lb chroot_devpts install ${*}
- lb chroot_proc install ${*}
- lb chroot_selinuxfs install ${*}
- lb chroot_sysfs install ${*}
- lb chroot_debianchroot install ${*}
- lb chroot_dpkg install ${*}
- lb chroot_sysv-rc install ${*}
- lb chroot_upstart install ${*}
- lb chroot_hosts install ${*}
- lb chroot_resolv install ${*}
- lb chroot_hostname install ${*}
- lb chroot_apt install ${*}
- lb chroot_archives binary install ${*}
+ lb chroot_devpts install ${@}
+ lb chroot_proc install ${@}
+ lb chroot_selinuxfs install ${@}
+ lb chroot_sysfs install ${@}
+ lb chroot_debianchroot install ${@}
+ lb chroot_dpkg install ${@}
+ lb chroot_sysv-rc install ${@}
+ lb chroot_upstart install ${@}
+ lb chroot_hosts install ${@}
+ lb chroot_resolv install ${@}
+ lb chroot_hostname install ${@}
+ lb chroot_apt install ${@}
+ lb chroot_archives binary install ${@}
touch .lock
else
diff --git a/scripts/build/lb_binary_silo b/scripts/build/binary_silo
similarity index 98%
rename from scripts/build/lb_binary_silo
rename to scripts/build/binary_silo
index 835a64e..b1ec175 100755
--- a/scripts/build/lb_binary_silo
+++ b/scripts/build/binary_silo
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'installs silo into binary')"
diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/binary_syslinux
similarity index 97%
rename from scripts/build/lb_binary_syslinux
rename to scripts/build/binary_syslinux
index 300841a..cf9c4a2 100755
--- a/scripts/build/lb_binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'installs syslinux into binary')"
@@ -160,7 +160,7 @@ then
# Internal system copy
if [ -n "${LIVE_BUILD}" ]
then
- _SOURCE="${LIVE_BUILD}/bootloaders/${_BOOTLOADER}"
+ _SOURCE="${LIVE_BUILD}/share/bootloaders/${_BOOTLOADER}"
else
_SOURCE="/usr/share/live/build/bootloaders/${_BOOTLOADER}"
fi
@@ -218,7 +218,7 @@ then
mv binary/live/vmlinuz-* binary/live/vmlinuz
mv binary/live/initrd.img-* binary/live/initrd.img
- sed -e "s|@FLAVOUR@|${LB_LINUX_FLAVOUR}|g" \
+ sed -e "s|@FLAVOUR@|${LB_LINUX_FLAVOURS}|g" \
-e "s|@KERNEL@|/live/vmlinuz|g" \
-e "s|@INITRD@|/live/initrd.img|g" \
-e "s|@LB_BOOTAPPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
diff --git a/scripts/build/lb_binary_tar b/scripts/build/binary_tar
similarity index 92%
rename from scripts/build/lb_binary_tar
rename to scripts/build/binary_tar
index d560b76..9b9b3de 100755
--- a/scripts/build/lb_binary_tar
+++ b/scripts/build/binary_tar
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build harddisk binary image')"
diff --git a/scripts/build/lb_binary_virtual-hdd b/scripts/build/binary_virtual-hdd
similarity index 95%
rename from scripts/build/lb_binary_virtual-hdd
rename to scripts/build/binary_virtual-hdd
index f34b3a4..f8121e6 100755
--- a/scripts/build/lb_binary_virtual-hdd
+++ b/scripts/build/binary_virtual-hdd
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build binary image')"
diff --git a/scripts/build/lb_binary_win32-loader b/scripts/build/binary_win32-loader
similarity index 95%
rename from scripts/build/lb_binary_win32-loader
rename to scripts/build/binary_win32-loader
index b0ecf99..7fd5ff2 100755
--- a/scripts/build/lb_binary_win32-loader
+++ b/scripts/build/binary_win32-loader
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'copy win32-loader into binary')"
diff --git a/scripts/build/lb_binary_yaboot b/scripts/build/binary_yaboot
similarity index 98%
rename from scripts/build/lb_binary_yaboot
rename to scripts/build/binary_yaboot
index c99cbfc..4838cf3 100755
--- a/scripts/build/lb_binary_yaboot
+++ b/scripts/build/binary_yaboot
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'installs yaboot into binary')"
diff --git a/scripts/build/lb_binary_zsync b/scripts/build/binary_zsync
similarity index 95%
rename from scripts/build/lb_binary_zsync
rename to scripts/build/binary_zsync
index f599bfc..7fdaf59 100755
--- a/scripts/build/lb_binary_zsync
+++ b/scripts/build/binary_zsync
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build zsync control files')"
diff --git a/scripts/build/lb_bootstrap b/scripts/build/bootstrap
similarity index 79%
rename from scripts/build/lb_bootstrap
rename to scripts/build/bootstrap
index a6d30ae..ed9c774 100755
--- a/scripts/build/lb_bootstrap
+++ b/scripts/build/bootstrap
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Automatically populating config tree
if [ -x auto/config ] && [ ! -e .build/config ]
@@ -35,11 +35,11 @@ Set_defaults
Setup_cleanup
# Bootstrapping system
-lb bootstrap_cache restore ${*}
-lb bootstrap_copy ${*}
-lb bootstrap_cdebootstrap ${*}
-lb bootstrap_debootstrap ${*}
-lb bootstrap_cache save ${*}
+lb bootstrap_cache restore ${@}
+lb bootstrap_copy ${@}
+lb bootstrap_cdebootstrap ${@}
+lb bootstrap_debootstrap ${@}
+lb bootstrap_cache save ${@}
# Temporary hack until we have multistrap in place
case "${LB_MODE}" in
diff --git a/scripts/build/lb_bootstrap_cache b/scripts/build/bootstrap_cache
similarity index 94%
rename from scripts/build/lb_bootstrap_cache
rename to scripts/build/bootstrap_cache
index ef71436..6b0f582 100755
--- a/scripts/build/lb_bootstrap_cache
+++ b/scripts/build/bootstrap_cache
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'cache bootstrap stage')"
diff --git a/scripts/build/lb_bootstrap_cdebootstrap b/scripts/build/bootstrap_cdebootstrap
similarity index 83%
rename from scripts/build/lb_bootstrap_cdebootstrap
rename to scripts/build/bootstrap_cdebootstrap
index c694f03..3c8843e 100755
--- a/scripts/build/lb_bootstrap_cdebootstrap
+++ b/scripts/build/bootstrap_cdebootstrap
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'bootstrap a Debian system with cdebootstrap(1)')"
@@ -29,6 +29,14 @@ then
exit 0
fi
+if [ ! -x "$(which cdebootstrap 2>/dev/null)" ]
+then
+ echo "E: cdebootstrap - command not found"; \
+ echo "I: cdebootstrap can be optained from http://ftp.debian.org/debian/pool/main/d/cdebootstrap/"; \
+ echo "I: On Debian based systems, cdebootstrap can be installed with 'apt-get install debootstrap'."; \
+ exit 1
+fi
+
# Check architecture
Check_crossarchitectures
@@ -61,26 +69,6 @@ then
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURES}"
fi
-if [ -n "${LB_BOOTSTRAP_INCLUDE}" ]
-then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --include=$(echo ${LB_BOOTSTRAP_INCLUDE} | sed 's| *|,|g')"
-fi
-
-if [ -n "${LB_BOOTSTRAP_EXCLUDE}" ]
-then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LB_BOOTSTRAP_EXCLUDE} | sed 's| *|,|g')"
-fi
-
-if [ -n "${LB_BOOTSTRAP_KEYRING}" ]
-then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LB_BOOTSTRAP_KEYRING}"
-fi
-
-if [ -n "${LB_BOOTSTRAP_FLAVOUR}" ]
-then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=${LB_BOOTSTRAP_FLAVOUR}"
-fi
-
if [ "${_DEBUG}" = "true" ]
then
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --debug"
diff --git a/scripts/build/lb_bootstrap_copy b/scripts/build/bootstrap_copy
similarity index 91%
rename from scripts/build/lb_bootstrap_copy
rename to scripts/build/bootstrap_copy
index c743142..1028342 100755
--- a/scripts/build/lb_bootstrap_copy
+++ b/scripts/build/bootstrap_copy
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'bootstrap by copying the host system')"
diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap
similarity index 88%
rename from scripts/build/lb_bootstrap_debootstrap
rename to scripts/build/bootstrap_debootstrap
index d5865b6..b0fa09f 100755
--- a/scripts/build/lb_bootstrap_debootstrap
+++ b/scripts/build/bootstrap_debootstrap
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'bootstrap a Debian system with debootstrap(8)')"
@@ -29,6 +29,14 @@ then
exit 0
fi
+if [ ! -x "$(which debootstrap 2>/dev/null)" ]
+then
+ echo "E: debootstrap - command not found"; \
+ echo "I: debootstrap can be optained from http://ftp.debian.org/debian/pool/main/d/debootstrap/"; \
+ echo "I: On Debian based systems, debootstrap can be installed with 'apt-get install debootstrap'."; \
+ exit 1
+fi
+
# Check architecture
Check_crossarchitectures
@@ -67,26 +75,10 @@ then
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components=$(echo ${LB_ARCHIVE_AREAS} | sed -e 's| |,|g')"
fi
-if [ -n "${LB_BOOTSTRAP_INCLUDE}" ]
-then
- DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --include=$(echo ${LB_BOOTSTRAP_INCLUDE} | sed 's| *|,|g')"
-fi
-
-if [ -n "${LB_BOOTSTRAP_EXCLUDE}" ]
-then
- DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LB_BOOTSTRAP_EXCLUDE} | sed 's| *|,|g')"
-fi
-
case "${LB_USE_FAKEROOT}" in
true)
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=fakechroot"
;;
- false)
- if [ -n "${LB_BOOTSTRAP_FLAVOUR}" ]
- then
- DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=${LB_BOOTSTRAP_FLAVOUR}"
- fi
- ;;
esac
if [ "${_VERBOSE}" = "true" ]
diff --git a/scripts/build/lb_build b/scripts/build/build
similarity index 89%
rename from scripts/build/lb_build
rename to scripts/build/build
index 7579111..d7b989d 100755
--- a/scripts/build/lb_build
+++ b/scripts/build/build
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Automatically populating config tree
if [ -x auto/config ] && [ ! -e .build/config ]
@@ -65,13 +65,13 @@ Set_defaults
Check_defaults
# Bootstrapping system
-lb bootstrap ${*}
+lb bootstrap ${@}
# Customizing chroot
-lb chroot ${*}
+lb chroot ${@}
# Building binary images
-lb binary ${*}
+lb binary ${@}
# Building source images
-lb source ${*}
+lb source ${@}
diff --git a/scripts/build/chroot b/scripts/build/chroot
new file mode 100755
index 0000000..1c63482
--- /dev/null
+++ b/scripts/build/chroot
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
+##
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
+set -e
+
+# Including common functions
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
+
+# Automatically populating config tree
+if [ -x auto/config ] && [ ! -e .build/config ]
+then
+ Echo_message "Automatically populating config tree."
+ lb config
+fi
+
+# Setting static variables
+DESCRIPTION="$(Echo 'customize the Debian system')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Setup cleanup function
+Setup_cleanup
+
+# Configuring chroot
+lb chroot_cache restore ${@}
+lb chroot_devpts install ${@}
+lb chroot_proc install ${@}
+lb chroot_selinuxfs install ${@}
+lb chroot_sysfs install ${@}
+lb chroot_debianchroot install ${@}
+lb chroot_dpkg install ${@}
+lb chroot_tmpfs install ${@}
+lb chroot_sysv-rc install ${@}
+lb chroot_upstart install ${@}
+lb chroot_hosts install ${@}
+lb chroot_resolv install ${@}
+lb chroot_hostname install ${@}
+lb chroot_apt install ${@}
+lb chroot_archives chroot install ${@}
+
+# Customizing chroot
+lb chroot_linux-image ${@}
+lb chroot_preseed ${@}
+
+for _PASS in install live
+do
+ lb chroot_package-lists ${_PASS} ${@}
+ lb chroot_install-packages ${_PASS} ${@}
+
+ if [ "${_PASS}" = install ]
+ then
+ Chroot chroot "dpkg-query -W" > chroot.packages.install
+ fi
+done
+
+lb chroot_live-packages ${@}
+lb chroot_includes ${@}
+lb chroot_hooks ${@}
+lb chroot_hacks ${@}
+lb chroot_interactive ${@}
+
+Chroot chroot "dpkg-query -W" > chroot.packages.live
+
+# Deconfiguring chroot
+lb chroot_archives chroot remove ${@}
+lb chroot_apt remove ${@}
+lb chroot_hostname remove ${@}
+lb chroot_resolv remove ${@}
+lb chroot_hosts remove ${@}
+lb chroot_sysv-rc remove ${@}
+lb chroot_upstart remove ${@}
+lb chroot_tmpfs remove ${@}
+lb chroot_dpkg remove ${@}
+lb chroot_debianchroot remove ${@}
+lb chroot_sysfs remove ${@}
+lb chroot_selinuxfs remove ${@}
+lb chroot_proc remove ${@}
+lb chroot_devpts remove ${@}
+lb chroot_cache save ${@}
diff --git a/scripts/build/lb_chroot_apt b/scripts/build/chroot_apt
similarity index 98%
rename from scripts/build/lb_chroot_apt
rename to scripts/build/chroot_apt
index a800c63..2e1bce2 100755
--- a/scripts/build/lb_chroot_apt
+++ b/scripts/build/chroot_apt
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /etc/apt/apt.conf')"
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/chroot_archives
similarity index 99%
rename from scripts/build/lb_chroot_archives
rename to scripts/build/chroot_archives
index 304480b..d0033d2 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/chroot_archives
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /etc/apt/sources.list')"
@@ -340,9 +340,9 @@ EOF
if Find_files chroot/root/packages/*.deb
then
# If we bootstrapped a minimal chroot, we need
- # to install apt-utils before we have have
+ # to install apt-utils before we have
# completed all the indices.
- if [ "${LB_BOOTSTRAP_FLAVOUR}" != "standard" ]
+ if [ ! -e chroot/usr/bin/apt-ftparchive ]
then
Apt chroot update
fi
diff --git a/scripts/build/lb_chroot_cache b/scripts/build/chroot_cache
similarity index 94%
rename from scripts/build/lb_chroot_cache
rename to scripts/build/chroot_cache
index 2464a0f..4c4b055 100755
--- a/scripts/build/lb_chroot_cache
+++ b/scripts/build/chroot_cache
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'cache chroot stage')"
diff --git a/scripts/build/lb_chroot_debianchroot b/scripts/build/chroot_debianchroot
similarity index 94%
rename from scripts/build/lb_chroot_debianchroot
rename to scripts/build/chroot_debianchroot
index 1db1142..7e07b36 100755
--- a/scripts/build/lb_chroot_debianchroot
+++ b/scripts/build/chroot_debianchroot
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /etc/debian_chroot')"
diff --git a/scripts/build/lb_chroot_devpts b/scripts/build/chroot_devpts
similarity index 94%
rename from scripts/build/lb_chroot_devpts
rename to scripts/build/chroot_devpts
index 6cde4f4..428927f 100755
--- a/scripts/build/lb_chroot_devpts
+++ b/scripts/build/chroot_devpts
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'mount /dev/pts')"
diff --git a/scripts/build/lb_chroot_dpkg b/scripts/build/chroot_dpkg
similarity index 96%
rename from scripts/build/lb_chroot_dpkg
rename to scripts/build/chroot_dpkg
index e2f76ad..9698f79 100755
--- a/scripts/build/lb_chroot_dpkg
+++ b/scripts/build/chroot_dpkg
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /sbin/dpkg')"
diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/chroot_hacks
similarity index 98%
rename from scripts/build/lb_chroot_hacks
rename to scripts/build/chroot_hacks
index 06bfe50..f0e885b 100755
--- a/scripts/build/lb_chroot_hacks
+++ b/scripts/build/chroot_hacks
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'execute hacks in chroot')"
diff --git a/scripts/build/lb_chroot_hooks b/scripts/build/chroot_hooks
similarity index 90%
rename from scripts/build/lb_chroot_hooks
rename to scripts/build/chroot_hooks
index 368e922..b81e3cb 100755
--- a/scripts/build/lb_chroot_hooks
+++ b/scripts/build/chroot_hooks
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'execute hooks in chroot')"
@@ -54,12 +54,14 @@ for _HOOK in ${LB_CHROOT_HOOKS}
do
for LOCATION in "${LIVE_BUILD}/hooks" /usr/share/live/build/hooks
do
- if [ -e "${LOCATION}/hooks/???-${_HOOK}.binary" ]
- then
- mkdir -p chroot/root/lb_chroot_hooks
- cp "${LOCATION}"/hooks/???-"${_HOOK}".chroot chroot/root/lb_chroot_hooks
- continue
- fi
+ for FILE in "${LOCATION}"/???-"${_HOOK}".chroot
+ do
+ if [ -e "${FILE}" ]
+ then
+ mkdir -p chroot/root/lb_chroot_hooks
+ cp "${FILE}" chroot/root/lb_chroot_hooks
+ fi
+ done
done
done
diff --git a/scripts/build/lb_chroot_hostname b/scripts/build/chroot_hostname
similarity index 94%
rename from scripts/build/lb_chroot_hostname
rename to scripts/build/chroot_hostname
index 28cb501..9f56901 100755
--- a/scripts/build/lb_chroot_hostname
+++ b/scripts/build/chroot_hostname
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /bin/hostname')"
diff --git a/scripts/build/lb_chroot_hosts b/scripts/build/chroot_hosts
similarity index 95%
rename from scripts/build/lb_chroot_hosts
rename to scripts/build/chroot_hosts
index d8d8abb..3adaebf 100755
--- a/scripts/build/lb_chroot_hosts
+++ b/scripts/build/chroot_hosts
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /etc/hosts')"
diff --git a/scripts/build/lb_chroot_includes b/scripts/build/chroot_includes
similarity index 91%
rename from scripts/build/lb_chroot_includes
rename to scripts/build/chroot_includes
index ba31d5c..8d3c75e 100755
--- a/scripts/build/lb_chroot_includes
+++ b/scripts/build/chroot_includes
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'copy files into chroot')"
diff --git a/scripts/build/lb_chroot_install-packages b/scripts/build/chroot_install-packages
similarity index 93%
rename from scripts/build/lb_chroot_install-packages
rename to scripts/build/chroot_install-packages
index d0ad724..d7d9164 100755
--- a/scripts/build/lb_chroot_install-packages
+++ b/scripts/build/chroot_install-packages
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'install queued packages into chroot')"
diff --git a/scripts/build/lb_chroot_interactive b/scripts/build/chroot_interactive
similarity index 92%
rename from scripts/build/lb_chroot_interactive
rename to scripts/build/chroot_interactive
index 58e69e7..31a34fc 100755
--- a/scripts/build/lb_chroot_interactive
+++ b/scripts/build/chroot_interactive
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'make build interactive')"
diff --git a/scripts/build/lb_chroot_linux-image b/scripts/build/chroot_linux-image
similarity index 97%
rename from scripts/build/lb_chroot_linux-image
rename to scripts/build/chroot_linux-image
index e2ca830..bb672c1 100755
--- a/scripts/build/lb_chroot_linux-image
+++ b/scripts/build/chroot_linux-image
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'schedule kernel packages for installation')"
diff --git a/scripts/build/lb_chroot_live-packages b/scripts/build/chroot_live-packages
similarity index 95%
rename from scripts/build/lb_chroot_live-packages
rename to scripts/build/chroot_live-packages
index 0e4ff44..057e423 100755
--- a/scripts/build/lb_chroot_live-packages
+++ b/scripts/build/chroot_live-packages
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'schedule live packages for installation')"
diff --git a/scripts/build/lb_chroot_package-lists b/scripts/build/chroot_package-lists
similarity index 95%
rename from scripts/build/lb_chroot_package-lists
rename to scripts/build/chroot_package-lists
index e2dabb1..b85c000 100755
--- a/scripts/build/lb_chroot_package-lists
+++ b/scripts/build/chroot_package-lists
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'queue install of package lists into chroot')"
diff --git a/scripts/build/lb_chroot_preseed b/scripts/build/chroot_preseed
similarity index 94%
rename from scripts/build/lb_chroot_preseed
rename to scripts/build/chroot_preseed
index 3aa83b3..1a70340 100755
--- a/scripts/build/lb_chroot_preseed
+++ b/scripts/build/chroot_preseed
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'execute local preseed in chroot')"
diff --git a/scripts/build/lb_chroot_proc b/scripts/build/chroot_proc
similarity index 94%
rename from scripts/build/lb_chroot_proc
rename to scripts/build/chroot_proc
index 4ceb088..2c13fce 100755
--- a/scripts/build/lb_chroot_proc
+++ b/scripts/build/chroot_proc
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'mount /proc')"
diff --git a/scripts/build/lb_chroot_resolv b/scripts/build/chroot_resolv
similarity index 95%
rename from scripts/build/lb_chroot_resolv
rename to scripts/build/chroot_resolv
index 417c412..b82e366 100755
--- a/scripts/build/lb_chroot_resolv
+++ b/scripts/build/chroot_resolv
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /etc/resolv.conf')"
diff --git a/scripts/build/lb_chroot_selinuxfs b/scripts/build/chroot_selinuxfs
similarity index 94%
rename from scripts/build/lb_chroot_selinuxfs
rename to scripts/build/chroot_selinuxfs
index e3a69fc..20e30fb 100755
--- a/scripts/build/lb_chroot_selinuxfs
+++ b/scripts/build/chroot_selinuxfs
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'mount /selinux')"
diff --git a/scripts/build/lb_chroot_sysfs b/scripts/build/chroot_sysfs
similarity index 94%
rename from scripts/build/lb_chroot_sysfs
rename to scripts/build/chroot_sysfs
index 048f1aa..4097284 100755
--- a/scripts/build/lb_chroot_sysfs
+++ b/scripts/build/chroot_sysfs
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'mount /sys')"
diff --git a/scripts/build/lb_chroot_sysv-rc b/scripts/build/chroot_sysv-rc
similarity index 94%
rename from scripts/build/lb_chroot_sysv-rc
rename to scripts/build/chroot_sysv-rc
index 94db1ca..4e1fc16 100755
--- a/scripts/build/lb_chroot_sysv-rc
+++ b/scripts/build/chroot_sysv-rc
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /usr/sbin/policy-rc.d')"
diff --git a/scripts/build/lb_chroot_tmpfs b/scripts/build/chroot_tmpfs
similarity index 94%
rename from scripts/build/lb_chroot_tmpfs
rename to scripts/build/chroot_tmpfs
index bf0c977..80311f5 100755
--- a/scripts/build/lb_chroot_tmpfs
+++ b/scripts/build/chroot_tmpfs
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'use tmpfs to speedup the build')"
diff --git a/scripts/build/lb_chroot_upstart b/scripts/build/chroot_upstart
similarity index 94%
rename from scripts/build/lb_chroot_upstart
rename to scripts/build/chroot_upstart
index ea22549..fd7c72f 100755
--- a/scripts/build/lb_chroot_upstart
+++ b/scripts/build/chroot_upstart
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /sbin/initctl')"
diff --git a/scripts/build/lb_clean b/scripts/build/clean
similarity index 91%
rename from scripts/build/lb_clean
rename to scripts/build/clean
index 4b7c23b..4104e52 100755
--- a/scripts/build/lb_clean
+++ b/scripts/build/clean
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Read meta config
if [ "${1}" != "noauto" ] && [ -x auto/clean ]
@@ -46,7 +46,7 @@ fi
rm -f .lock
-if [ -z "${*}" ]
+if [ -z "${@}" ]
then
ARGUMENTS="--all"
else
@@ -57,10 +57,10 @@ for ARGUMENT in ${ARGUMENTS}
do
case "${ARGUMENT}" in
--all)
- LB=1 "${0}" noauto --chroot
- LB=1 "${0}" noauto --binary
- LB=1 "${0}" noauto --stage
- LB=1 "${0}" noauto --source
+ "${0}" noauto --chroot
+ "${0}" noauto --binary
+ "${0}" noauto --stage
+ "${0}" noauto --source
rmdir --ignore-fail-on-non-empty auto > /dev/null 2>&1 || true
;;
@@ -109,13 +109,13 @@ do
;;
--remove)
- LB=1 "${0}" --all
+ "${0}" --all
rm -rf cache/packages.*
;;
--purge)
- LB=1 "${0}" --all
- LB=1 "${0}" --cache
+ "${0}" --all
+ "${0}" --cache
if [ -e auto/config ]
then
diff --git a/scripts/build/lb_config b/scripts/build/config
similarity index 97%
rename from scripts/build/lb_config
rename to scripts/build/config
index 8dbd0b8..2a1ae56 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/config
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
PROGRAM="lb config"
@@ -34,8 +34,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--bootappend-failsafe PARAMETER|\"PARAMETERS\"]\n\
\t [--bootloader grub|syslinux|yaboot]\n\
\t [--bootstrap cdebootstrap|cdebootstrap-static|debootstrap|copy]\n\
-\t [-f|--bootstrap-flavour minimal|standard]\n\
-\t [--bootstrap-keyring PACKAGE]\n\
\t [--cache true|false]\n\
\t [--cache-indices true|false]\n\
\t [--cache-packages true|false]\n\
@@ -142,11 +140,11 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
Local_arguments ()
{
- LONG_OPTIONS="apt:,apt-ftp-proxy:,apt-http-proxy:,apt-options:,aptitute-options:,
+ LONG_OPTIONS="apt:,apt-ftp-proxy:,apt-http-proxy:,apt-options:,aptitute-options:debootstrap-options:,cdebootstrap-ptions,
apt-pipeline:,apt-recommends:,apt-secure:,apt-source-archives:,bootstrap:,cache:,cache-indices:,cache-packages:,
cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,dump,
initramfs:,initramfs-compression:,initsystem:,fdisk:,losetup:,mode:,system:,root-command:,use-fakeroot:,tasksel:,
- templates:,architectures:,bootstrap-flavour:,bootstrap-keyring:,clean,
+ templates:,architectures:,clean,
distribution:,parent-distribution:,parent-debian-installer-distribution:,parent-mirror-bootstrap:,parent-mirror-chroot:,parent-mirror-chroot-security:,parent-mirror-chroot-volatile:,parent-mirror-chroot-backports:,parent-mirror-binary:,
parent-mirror-binary-security:,parent-mirror-binary-volatile:,parent-mirror-binary-backports:,parent-mirror-debian-installer:,
mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-volatile:,mirror-chroot-backports:,mirror-binary:,
@@ -275,6 +273,16 @@ Local_arguments ()
shift 2
;;
+ --debootstrap-options)
+ DEBOOTSTRAP_OPTIONS="${2}"
+ shift 2
+ ;;
+
+ --cdebootstrap-options)
+ CDEBOOTSTRAP_OPTIONS="${2}"
+ shift 2
+ ;;
+
--cache)
LB_CACHE="${2}"
shift 2
@@ -371,16 +379,6 @@ Local_arguments ()
shift 2
;;
- -f|--bootstrap-flavour)
- LB_BOOTSTRAP_FLAVOUR="${2}"
- shift 2
- ;;
-
- --bootstrap-keyring)
- LB_BOOTSTRAP_KEYRING="${2}"
- shift 2
- ;;
-
-d|--distribution)
LB_DISTRIBUTION="${2}"
shift 2
@@ -916,7 +914,7 @@ if ! In_list "--ignore-system-defaults" "${@}"
then
Echo_message "Considering defaults defined in %s" "/etc/live/build.conf"
- Read_conffiles /etc/live/build.conf /etc/live/build.d/*
+ Read_conffiles /etc/live/build.conf /etc/live/build/*
fi
# Reading existing configuration
@@ -1087,6 +1085,8 @@ _QUIET="${_QUIET}"
# Internal stuff (FIXME)
APT_OPTIONS="${APT_OPTIONS}"
APTITUDE_OPTIONS="${APTITUDE_OPTIONS}"
+DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS}"
+CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS}"
GZIP_OPTIONS="${GZIP_OPTIONS}"
ISOHYBRID_OPTIONS="${ISOHYBRID_OPTIONS}"
EOF
@@ -1099,22 +1099,6 @@ cat > config/bootstrap << EOF
# (Default: autodetected)
LB_ARCHITECTURES="${LB_ARCHITECTURES}"
-# \$LB_BOOTSTRAP_INCLUDE: include packages on base
-# (Default: empty)
-LB_BOOTSTRAP_INCLUDE="${LB_BOOTSTRAP_INCLUDE}"
-
-# \$LB_BOOTSTRAP_EXCLUDE: exclude packages on base
-# (Default: empty)
-LB_BOOTSTRAP_EXCLUDE="${LB_BOOTSTRAP_EXCLUDE}"
-
-# \$LB_BOOTSTRAP_FLAVOUR: select flavour to use
-# (Default: empty)
-LB_BOOTSTRAP_FLAVOUR="${LB_BOOTSTRAP_FLAVOUR}"
-
-# \$LB_BOOTSTRAP_KEYRING: set distribution keyring
-# (Default: empty)
-LB_BOOTSTRAP_KEYRING="${LB_BOOTSTRAP_KEYRING}"
-
# \$LB_DISTRIBUTION: select distribution to use
# (Default: ${LB_DISTRIBUTION})
LB_DISTRIBUTION="${LB_DISTRIBUTION}"
diff --git a/scripts/build/lb_binary b/scripts/build/lb_binary
deleted file mode 100755
index 600d893..0000000
--- a/scripts/build/lb_binary
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
-##
-## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-set -e
-
-# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
-
-
-# Automatically populating config tree
-if [ -x auto/config ] && [ ! -e .build/config ]
-then
- Echo_message "Automatically populating config tree."
- lb config
-fi
-
-# Setting static variables
-DESCRIPTION="$(Echo 'build binary images')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Setup cleanup function
-Setup_cleanup
-
-# Preparing root filesystem
-lb binary_chroot ${*}
-
-if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
-then
- # Configuring chroot
- lb chroot_devpts install ${*}
- lb chroot_proc install ${*}
- lb chroot_selinuxfs install ${*}
- lb chroot_sysfs install ${*}
- lb chroot_hosts install ${*}
- lb chroot_resolv install ${*}
- lb chroot_hostname install ${*}
- lb chroot_sysv-rc install ${*}
- lb chroot_upstart install ${*}
- lb chroot_apt install-binary ${*}
- lb chroot_archives chroot install ${*}
-fi
-
-# Building root filesystem
-lb binary_rootfs ${*}
-lb binary_manifest ${*}
-
-# Prepare images
-lb binary_package-lists ${*}
-lb binary_linux-image ${*}
-lb binary_debian-installer ${*}
-lb binary_memtest ${*}
-lb binary_grub ${*}
-lb binary_grub2 ${*}
-lb binary_syslinux ${*}
-lb binary_yaboot ${*}
-lb binary_silo ${*}
-lb binary_disk ${*}
-lb binary_win32-loader ${*}
-lb binary_includes ${*}
-lb binary_hooks ${*}
-lb binary_checksums ${*}
-
-if [ "${LB_BUILD_WITH_CHROOT}" != "true" ]
-then
- lb chroot_devpts install ${*}
- lb chroot_proc install ${*}
- lb chroot_selinuxfs install ${*}
- lb chroot_sysfs install ${*}
-fi
-
-# Building images
-lb binary_iso ${*}
-lb binary_netboot ${*}
-lb binary_tar ${*}
-lb binary_hdd ${*}
-lb binary_virtual-hdd ${*}
-
-lb binary_zsync ${*}
-
-if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
-then
- # Deconfiguring chroot
- rm -f .build/chroot_archives
- lb chroot_apt remove ${*}
- lb chroot_hostname remove ${*}
- lb chroot_resolv remove ${*}
- lb chroot_hosts remove ${*}
- lb chroot_upstart remove ${*}
- lb chroot_sysv-rc remove ${*}
- lb chroot_dpkg remove ${*}
- lb chroot_debianchroot remove ${*}
-fi
-
-lb chroot_sysfs remove ${*}
-lb chroot_selinuxfs remove ${*}
-lb chroot_proc remove ${*}
-lb chroot_devpts remove ${*}
diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot
deleted file mode 100755
index ada67c3..0000000
--- a/scripts/build/lb_chroot
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
-##
-## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-set -e
-
-# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
-
-# Automatically populating config tree
-if [ -x auto/config ] && [ ! -e .build/config ]
-then
- Echo_message "Automatically populating config tree."
- lb config
-fi
-
-# Setting static variables
-DESCRIPTION="$(Echo 'customize the Debian system')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Setup cleanup function
-Setup_cleanup
-
-# Configuring chroot
-lb chroot_cache restore ${*}
-lb chroot_devpts install ${*}
-lb chroot_proc install ${*}
-lb chroot_selinuxfs install ${*}
-lb chroot_sysfs install ${*}
-lb chroot_debianchroot install ${*}
-lb chroot_dpkg install ${*}
-lb chroot_tmpfs install ${*}
-lb chroot_sysv-rc install ${*}
-lb chroot_upstart install ${*}
-lb chroot_hosts install ${*}
-lb chroot_resolv install ${*}
-lb chroot_hostname install ${*}
-lb chroot_apt install ${*}
-lb chroot_archives chroot install ${*}
-
-# Customizing chroot
-lb chroot_linux-image ${*}
-lb chroot_preseed ${*}
-
-for _PASS in install live
-do
- lb chroot_package-lists ${_PASS} ${*}
- lb chroot_install-packages ${_PASS} ${*}
-
- if [ "${_PASS}" = install ]
- then
- Chroot chroot "dpkg-query -W" > chroot.packages.install
- fi
-done
-
-lb chroot_live-packages ${*}
-lb chroot_includes ${*}
-lb chroot_hooks ${*}
-lb chroot_hacks ${*}
-lb chroot_interactive ${*}
-
-Chroot chroot "dpkg-query -W" > chroot.packages.live
-
-# Deconfiguring chroot
-lb chroot_archives chroot remove ${*}
-lb chroot_apt remove ${*}
-lb chroot_hostname remove ${*}
-lb chroot_resolv remove ${*}
-lb chroot_hosts remove ${*}
-lb chroot_sysv-rc remove ${*}
-lb chroot_upstart remove ${*}
-lb chroot_tmpfs remove ${*}
-lb chroot_dpkg remove ${*}
-lb chroot_debianchroot remove ${*}
-lb chroot_sysfs remove ${*}
-lb chroot_selinuxfs remove ${*}
-lb chroot_proc remove ${*}
-lb chroot_devpts remove ${*}
-lb chroot_cache save ${*}
diff --git a/scripts/build/lb_source b/scripts/build/source
similarity index 64%
rename from scripts/build/lb_source
rename to scripts/build/source
index 7e1c952..d52e8d4 100755
--- a/scripts/build/lb_source
+++ b/scripts/build/source
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Automatically populating config tree
if [ -x auto/config ] && [ ! -e .build/config ]
@@ -42,25 +42,25 @@ fi
Setup_cleanup
# Enabling network in chroot
-lb chroot_hosts install ${*}
-lb chroot_resolv install ${*}
-lb chroot_hostname install ${*}
-lb chroot_archives source install ${*}
+lb chroot_hosts install ${@}
+lb chroot_resolv install ${@}
+lb chroot_hostname install ${@}
+lb chroot_archives source install ${@}
# Preparing images
-lb source_debian-live ${*}
-lb source_debian ${*}
-lb source_disk ${*}
-lb source_checksums ${*}
+lb source_debian-live ${@}
+lb source_debian ${@}
+lb source_disk ${@}
+lb source_checksums ${@}
# Building images
-lb source_iso ${*}
-lb source_tar ${*}
-lb source_hdd ${*}
-lb source_virtual-hdd ${*}
+lb source_iso ${@}
+lb source_tar ${@}
+lb source_hdd ${@}
+lb source_virtual-hdd ${@}
# Deconfiguring chroot
-lb chroot_archives chroot remove ${*}
-lb chroot_hostname remove ${*}
-lb chroot_resolv remove ${*}
-lb chroot_hosts remove ${*}
+lb chroot_archives chroot remove ${@}
+lb chroot_hostname remove ${@}
+lb chroot_resolv remove ${@}
+lb chroot_hosts remove ${@}
diff --git a/scripts/build/lb_source_checksums b/scripts/build/source_checksums
similarity index 94%
rename from scripts/build/lb_source_checksums
rename to scripts/build/source_checksums
index 4dab56a..cf9cce0 100755
--- a/scripts/build/lb_source_checksums
+++ b/scripts/build/source_checksums
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'create source checksums')"
diff --git a/scripts/build/lb_source_debian b/scripts/build/source_debian
similarity index 96%
rename from scripts/build/lb_source_debian
rename to scripts/build/source_debian
index d7fa4af..95a155d 100755
--- a/scripts/build/lb_source_debian
+++ b/scripts/build/source_debian
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'debian sources')"
diff --git a/scripts/build/lb_source_debian-live b/scripts/build/source_debian-live
similarity index 92%
rename from scripts/build/lb_source_debian-live
rename to scripts/build/source_debian-live
index c9c8d40..868d9d9 100755
--- a/scripts/build/lb_source_debian-live
+++ b/scripts/build/source_debian-live
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'copy debian-live config into source')"
diff --git a/scripts/build/lb_source_disk b/scripts/build/source_disk
similarity index 96%
rename from scripts/build/lb_source_disk
rename to scripts/build/source_disk
index e1216cc..e51b74d 100755
--- a/scripts/build/lb_source_disk
+++ b/scripts/build/source_disk
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'install disk information into source')"
diff --git a/scripts/build/lb_source_hdd b/scripts/build/source_hdd
similarity index 96%
rename from scripts/build/lb_source_hdd
rename to scripts/build/source_hdd
index 9d597de..0d76407 100755
--- a/scripts/build/lb_source_hdd
+++ b/scripts/build/source_hdd
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build source image')"
diff --git a/scripts/build/lb_source_iso b/scripts/build/source_iso
similarity index 95%
rename from scripts/build/lb_source_iso
rename to scripts/build/source_iso
index 6b3807f..a9f0c28 100755
--- a/scripts/build/lb_source_iso
+++ b/scripts/build/source_iso
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build iso source image')"
diff --git a/scripts/build/lb_source_tar b/scripts/build/source_tar
similarity index 94%
rename from scripts/build/lb_source_tar
rename to scripts/build/source_tar
index ae82a2e..0ef302e 100755
--- a/scripts/build/lb_source_tar
+++ b/scripts/build/source_tar
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build source tarball')"
diff --git a/scripts/build/lb_source_virtual-hdd b/scripts/build/source_virtual-hdd
similarity index 95%
rename from scripts/build/lb_source_virtual-hdd
rename to scripts/build/source_virtual-hdd
index de4665a..d37fa9a 100755
--- a/scripts/build/lb_source_virtual-hdd
+++ b/scripts/build/source_virtual-hdd
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build source image')"
diff --git a/scripts/build/lb_testroot b/scripts/build/testroot
similarity index 87%
rename from scripts/build/lb_testroot
rename to scripts/build/testroot
index cec89df..9ded104 100755
--- a/scripts/build/lb_testroot
+++ b/scripts/build/testroot
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'ensure that a system is built as root')"
diff --git a/templates/cgi/debian/build.html b/templates/cgi/debian/build.html
index d819fa8..166ac33 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>
@@ -37,7 +36,7 @@
<b>Advanced binary options</b>
<table>
- <tr><td>--apt-indices: </td><td>LB_BINARY_INDICES</td></tr>
+ <tr><td>--apt-indices: </td><td>LB_APT_INDICES</td></tr>
<tr><td>--bootappend-live: </td><td>LB_BOOTAPPEND_LIVE</td></tr>
<tr><td>--bootloader: </td><td>LB_BOOTLOADER</td></tr>
<tr><td>--debian-installer: </td><td>LB_DEBIAN_INSTALLER</td></tr>
diff --git a/templates/cgi/debian/form.html b/templates/cgi/debian/form.html
index 9912f4e..5cf1cb8 100644
--- a/templates/cgi/debian/form.html
+++ b/templates/cgi/debian/form.html
@@ -83,15 +83,6 @@
<!-- 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>
</tr>
--
live-build
More information about the debian-live-changes
mailing list