Using 'none' instead of 'plain' when specifying that no chroot filesystem should be used.

This commit is contained in:
Daniel Baumann 2011-09-28 11:17:47 +02:00
parent da0801ebf4
commit 957cdb7cfe
7 changed files with 27 additions and 27 deletions

View File

@ -66,7 +66,7 @@
.br
[\fB\-\-build\-with\-chroot\fP true|false]
.br
[\fB\-\-chroot\-filesystem\fP ext2|ext3|ext4|squashfs|plain|jffs2]
[\fB\-\-chroot\-filesystem\fP ext2|ext3|ext4|squashfs|jffs2|none]
.br
[\fB\-\-clean\fP]
.br
@ -401,13 +401,13 @@ 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|plain|jffs2" 4
.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 plain, then no filesystem image is created and the root
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 a plain root filesystem, e.g. fat16/fat32 and plain
don't work as linux does not support to run on them.
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\fP 4
minimizes config directory by automatically removing unused and thus empty
subdirectories.

View File

@ -61,7 +61,7 @@
.br
[\fB\-\-build\-with\-chroot\fR true|false]
.br
[\fB\-\-chroot\-filesystem\fR ext2|ext3|ext4|squashfs|plain|jffs2]
[\fB\-\-chroot\-filesystem\fR ext2|ext3|ext4|squashfs|jffs2|none]
.br
[\fB\-\-clean\fR]
.br
@ -303,8 +303,8 @@ defines if the binary image should contain a file called md5sums.txt, sha1sums.t
defines the compression program to be used to compress tarballs. Defaults to gzip.
.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, genisoimage, 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|plain|jffs2" 4
defines which filesystem type should be used for the root filesystem image. If you use plain, 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 a plain root filesystem, e.g. fat16/fat32 and plain don't work as linux does not support to run on them.
.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
minimizes config directory by automatically removing unused and thus empty subdirectories.
.IP "\-c|\fB\-\-conffile\fR \fIFILE\fR" 4

View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2011-09-28 09:43+0300\n"
"POT-Creation-Date: 2011-09-28 11:15+0300\n"
"PO-Revision-Date: 2011-09-28 09:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@ -755,7 +755,7 @@ msgstr ""
#. type: Plain text
#: en/lb_config.1:65
msgid " [B<--chroot-filesystem> ext2|ext3|ext4|squashfs|plain|jffs2]"
msgid " [B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none]"
msgstr ""
#. type: Plain text
@ -1627,18 +1627,18 @@ msgstr ""
#. type: IP
#: en/lb_config.1:306
#, no-wrap
msgid "B<--chroot-filesystem> ext2|ext3|ext4|squashfs|plain|jffs2"
msgid "B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none"
msgstr ""
#. type: Plain text
#: en/lb_config.1:308
msgid ""
"defines which filesystem type should be used for the root filesystem image. "
"If you use plain, 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 a plain root filesystem, e.g. fat16/fat32 and plain don't work "
"as linux does not support to run on them."
"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."
msgstr ""
#. type: IP

View File

@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2011-09-28 09:43+0300\n"
"POT-Creation-Date: 2011-09-28 11:15+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -755,7 +755,7 @@ msgstr ""
#. type: Plain text
#: en/lb_config.1:65
msgid " [B<--chroot-filesystem> ext2|ext3|ext4|squashfs|plain|jffs2]"
msgid " [B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none]"
msgstr ""
#. type: Plain text
@ -1627,18 +1627,18 @@ msgstr ""
#. type: IP
#: en/lb_config.1:306
#, no-wrap
msgid "B<--chroot-filesystem> ext2|ext3|ext4|squashfs|plain|jffs2"
msgid "B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none"
msgstr ""
#. type: Plain text
#: en/lb_config.1:308
msgid ""
"defines which filesystem type should be used for the root filesystem image. "
"If you use plain, 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 a plain root filesystem, e.g. fat16/fat32 and plain don't work "
"as linux does not support to run on them."
"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."
msgstr ""
#. type: IP

View File

@ -85,7 +85,7 @@ ${LB_ROOT_COMMAND} rm -rf chroot/chroot
${LB_ROOT_COMMAND} rm -rf chroot.tmp
# Copying new chroot
if [ -d cache/stages_bootstrap ] && [ "${LB_CHROOT_FILESYSTEM}" != "plain" ]
if [ -d cache/stages_bootstrap ] && [ "${LB_CHROOT_FILESYSTEM}" != "none" ]
then
${LB_ROOT_COMMAND} mv chroot chroot.tmp
${LB_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot

View File

@ -284,7 +284,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
Save_cache cache/packages_binary
;;
plain)
none)
if [ -d binary/${INITFS}/filesystem.dir ]
then
rm -rf binary/${INITFS}/filesystem.dir

View File

@ -55,7 +55,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--checksums md5|sha1|sha256|none]\n\
\t [--compression bzip2|gzip|lzip|none]\n\
\t [--build-with-chroot true|false]\n\
\t [--chroot-filesystem ext2|ext3|ext4|squashfs|plain|jffs2]\n\
\t [--chroot-filesystem ext2|ext3|ext4|squashfs|jffs2|none]\n\
\t [--clean\n\
\t [-c|--conffile FILE]\n\
\t [--debconf-frontend dialog|editor|noninteractive|readline]\n\