Commit dbbcbe6f authored by Daniel Baumann's avatar Daniel Baumann
Browse files

Adding upstream version 4.0~a11.

parent d487b52d
4.0~a10-1
4.0~a11-1
......@@ -849,14 +849,6 @@ Set_defaults ()
amd64|i386)
LB_BOOTLOADER="syslinux"
;;
powerpc)
LB_BOOTLOADER="yaboot"
;;
sparc)
LB_BOOTLOADER="silo"
;;
esac
fi
......@@ -1194,6 +1186,13 @@ Check_defaults ()
fi
fi
if echo ${LB_HDD_LABEL} | grep -qs ' '
then
Echo_error "There are currently no whitespaces supported in hdd labels."
exit 1
fi
if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
then
# d-i true, no caching
......@@ -1217,9 +1216,8 @@ Check_defaults ()
case "${LIVE_IMAGE_TYPE}" in
hdd*)
# grub or yaboot + hdd
case "${LB_BOOTLOADER}" in
grub|yaboot)
grub)
Echo_error "You have selected a combination of bootloader and image type that is currently not supported by live-build. Please use either another bootloader or a different image type."
exit 1
;;
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 15.02.2013 4.0~a10\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 15.02.2013 4.0~a11\-1 "Debian Live Project"
.SH NAME
\fBlb\fP \- wrapper for live\-build programs
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 15.02.2013 4.0~a10\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 15.02.2013 4.0~a11\-1 "Debian Live Project"
.SH NAME
\fBlb binary\fP \- Complete the binary stage
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 15.02.2013 4.0~a10\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 15.02.2013 4.0~a11\-1 "Debian Live Project"
.SH NAME
\fBlb bootstrap\fP \- Complete the bootstrap stage
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 15.02.2013 4.0~a10\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 15.02.2013 4.0~a11\-1 "Debian Live Project"
.SH NAME
\fBlb build\fP \- Complete the bootstrap, chroot, binary, and source stages
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 15.02.2013 4.0~a10\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 15.02.2013 4.0~a11\-1 "Debian Live Project"
.SH NAME
\fBlb chroot\fP \- Complete the chroot stage
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 15.02.2013 4.0~a10\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 15.02.2013 4.0~a11\-1 "Debian Live Project"
.SH NAME
\fBlb clean\fP \- Clean build directory
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 15.02.2013 4.0~a10\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 15.02.2013 4.0~a11\-1 "Debian Live Project"
.SH NAME
\fBlb config\fP \- Create config directory
......@@ -44,7 +44,7 @@
.br
[\fB\-\-bootappend\-live\fP \fIPARAMETER\fP|\fI"PARAMETERS"\fP]
.br
[\fB\-\-bootloader\fP grub|syslinux|yaboot]
[\fB\-\-bootloader\fP grub|syslinux]
.br
[\fB\-\-bootstrap\fP cdebootstrap|cdebootstrap\-static|debootstrap]
.br
......@@ -329,7 +329,7 @@ sets boot parameters specific to debian\-installer, if included.
sets boot parameters specific to debian\-live. A complete list of boot
parameters can be found in the \fIlive\-boot\fP(7) and \fIlive\-config\fP(7) manual
pages.
.IP "\fB\-\-bootloader\fP grub|syslinux|yaboot" 4
.IP "\fB\-\-bootloader\fP grub|syslinux" 4
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
......@@ -337,7 +337,7 @@ 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\fP 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.
i386, the default is syslinux.
.IP "\fB\-\-bootstrap\fP cdebootstrap|cdebootstrap\-static|debootstrap" 4
defines which program is used to bootstrap the debian chroot, default is
debootstrap.
......@@ -381,12 +381,12 @@ 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. This is a very dangerous option, using the tools of the host system
can lead to tainted and even non\-bootable images if the host systems version
of the required tools (mainly these are the bootloaders such as syslinux,
grub and yaboot, and the auxilliary tools such as dosfstools, xorriso,
squashfs\-tools and others) do not \fBexactely\fP match what is present at
build\-time in the target distribution. Never do disable this option unless
you are \fBexactely\fP sure what you are doing and have \fBcompletely\fP\fI
understood its consequences.\fP
of the required tools (mainly these are the bootloaders such as syslinux and
grub, and the auxilliary tools such as dosfstools, xorriso, squashfs\-tools
and others) do not \fBexactely\fP match what is present at build\-time in the
target distribution. Never do disable this option unless you are \fBexactely\fP
sure what you are doing and have \fBcompletely\fP\fI understood its
consequences.\fP
.IP "\fB\-\-chroot\-filesystem\fP ext2|ext3|ext4|squashfs|jffs2|none" 4
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
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 15.02.2013 4.0~a10\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 15.02.2013 4.0~a11\-1 "Debian Live Project"
.SH NAME
\fBlb source\fP \- Complete the source stage
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 15.02.2013 4.0~a10\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 15.02.2013 4.0~a11\-1 "Debian Live Project"
.SH NAME
\fBlb testroot\fP \- Ensure that a system is built as root
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 7 15.02.2013 4.0~a10\-1 "Debian Live Project"
.TH LIVE\-BUILD 7 15.02.2013 4.0~a11\-1 "Debian Live Project"
.SH NAME
\fBlive\-build\fP \- the Debian Live tool suite
......@@ -195,8 +195,6 @@ installs a memtest into binary
build netboot binary image
.IP \fBlb_binary_rootfs\fP(1) 4
build rootfs image
.IP \fBlb_binary_silo\fP(1) 4
installs silo into binary
.IP \fBlb_binary_syslinux\fP(1) 4
installs syslinux into binary
.IP \fBlb_binary_tar\fP(1) 4
......@@ -205,8 +203,6 @@ build harddisk binary image
build binary hdd image
.IP \fBlb_binary_win32\-loader\fP(1) 4
installs win32\-loader into binary
.IP \fBlb_binary_yaboot\fP(1) 4
installs yaboot into binary
.SS "Source commands"
.IP \fBlb_source_debian\fP(1) 4
download sources
......
.TH LIVE\-BUILD 1 2013\-02\-15 4.0~a10-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2013\-02\-15 4.0~a11-1 "Debian Live Project"
.SH NAME
\fBlb\fR \- wrapper for live\-build programs
......
.TH LIVE\-BUILD 1 2013\-02\-15 4.0~a10-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2013\-02\-15 4.0~a11-1 "Debian Live Project"
.SH NAME
\fBlb binary\fR \- Complete the binary stage
......
.TH LIVE\-BUILD 1 2013\-02\-15 4.0~a10-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2013\-02\-15 4.0~a11-1 "Debian Live Project"
.SH NAME
\fBlb bootstrap\fR \- Complete the bootstrap stage
......
.TH LIVE\-BUILD 1 2013\-02\-15 4.0~a10-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2013\-02\-15 4.0~a11-1 "Debian Live Project"
.SH NAME
\fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages
......
.TH LIVE\-BUILD 1 2013\-02\-15 4.0~a10-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2013\-02\-15 4.0~a11-1 "Debian Live Project"
.SH NAME
\fBlb chroot\fR \- Complete the chroot stage
......
.TH LIVE\-BUILD 1 2013\-02\-15 4.0~a10-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2013\-02\-15 4.0~a11-1 "Debian Live Project"
.SH NAME
\fBlb clean\fR \- Clean build directory
......
.TH LIVE\-BUILD 1 2013\-02\-15 4.0~a10-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2013\-02\-15 4.0~a11-1 "Debian Live Project"
.SH NAME
\fBlb config\fR \- Create config directory
......@@ -39,7 +39,7 @@
.br
[\fB\-\-bootappend\-live\fR \fIPARAMETER\fR|\fI"PARAMETERS"\fR]
.br
[\fB\-\-bootloader\fR grub|syslinux|yaboot]
[\fB\-\-bootloader\fR grub|syslinux]
.br
[\fB\-\-bootstrap\fR cdebootstrap|cdebootstrap-static|debootstrap]
.br
......@@ -273,8 +273,8 @@ defines the filesystem to be used in the image type. This only has an effect if
sets boot parameters specific to debian\-installer, if included.
.IP "\fB\-\-bootappend\-live\fR \fIPARAMETER\fR|""\fIPARAMETERS\fR""" 4
sets boot parameters specific to debian\-live. A complete list of boot parameters can be found in the \fIlive\-boot\fR(7) and \fIlive\-config\fR(7) manual pages.
.IP "\fB\-\-bootloader\fR grub|syslinux|yaboot" 4
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\-\-bootloader\fR grub|syslinux" 4
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.
.IP "\fB\-\-bootstrap\fR cdebootstrap|cdebootstrap-static|debootstrap" 4
defines which program is used to bootstrap the debian chroot, default is debootstrap.
.IP "\fB\-\-cache\fR true|false" 4
......@@ -292,7 +292,7 @@ defines the compression program to be used to compress tarballs. Defaults to gzi
.IP "\fB\-\-config\fR \fIGIT_URL\fR::\fIGIT_ID\fR" 4
allows to bootstrap a config tree from a git repositories, optionally appended by a Git Id (branch, commit, tag, etc.).
.IP "\fB\-\-build\-with\-chroot\fR true|false" 4
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. This is a very dangerous option, using the tools of the host system can lead to tainted and even non-bootable images if the host systems version of the required tools (mainly these are the bootloaders such as syslinux, grub and yaboot, and the auxilliary tools such as dosfstools, xorriso, squashfs-tools and others) do not \fBexactely\fR match what is present at build-time in the target distribution. Never do disable this option unless you are \fBexactely\fR sure what you are doing and have \fBcompletely\fI understood its consequences.
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. This is a very dangerous option, using the tools of the host system can lead to tainted and even non-bootable images if the host systems version of the required tools (mainly these are the bootloaders such as syslinux and grub, and the auxilliary tools such as dosfstools, xorriso, squashfs-tools and others) do not \fBexactely\fR match what is present at build-time in the target distribution. Never do disable this option unless you are \fBexactely\fR sure what you are doing and have \fBcompletely\fI understood its consequences.
.IP "\fB\-\-chroot\-filesystem\fR ext2|ext3|ext4|squashfs|jffs2|none" 4
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 content is copied on the binary image filesystem as flat files. Depending on what binary filesystem you have choosen, it may not be possible to build with such a plain root filesystem, e.g. fat16/fat32 will not work as linux does not support to run directly on them.
.IP "\fB\-\-clean\fR" 4
......
.TH LIVE\-BUILD 1 2013\-02\-15 4.0~a10-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2013\-02\-15 4.0~a11-1 "Debian Live Project"
.SH NAME
\fBlb source\fR \- Complete the source stage
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment