From e8a9169e26d88c49fd580977202af34aecc719b2 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 28 Jul 2012 19:17:53 +0200 Subject: Allowing to specify a git repository to lb_config in order to bootstrap a config tree. --- manpages/de/lb_config.de.1 | 4 + manpages/en/lb_config.1 | 4 + manpages/po/de/lb_config.1.po | 706 +++++++++++++++++++++--------------------- manpages/pot/lb_config.1.pot | 706 +++++++++++++++++++++--------------------- scripts/build/lb_config | 25 +- 5 files changed, 754 insertions(+), 691 deletions(-) diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1 index 1f5449cf9..1eac1c4c8 100644 --- a/manpages/de/lb_config.de.1 +++ b/manpages/de/lb_config.de.1 @@ -63,6 +63,8 @@ [\fB\-\-checksums\fP md5|sha1|sha256|none] .br [\fB\-\-compression\fP bzip2|gzip|lzip|none] +.br + [\fB\-\-config\fP \fIGIT_URL\fP] .br [\fB\-\-build\-with\-chroot\fP true|false] .br @@ -391,6 +393,8 @@ images it can save some time by not calculating the checksums. .IP "\fB\-\-compression\fP bzip2|gzip|lzip|none" 4 defines the compression program to be used to compress tarballs. Defaults to gzip. +.IP "\fB\-\-config\fP \fIGIT_URL\fP" 4 +allows to bootstrap a config tree from a git repositories. .IP "\fB\-\-build\-with\-chroot\fP 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 diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1 index a09896678..664e08559 100644 --- a/manpages/en/lb_config.1 +++ b/manpages/en/lb_config.1 @@ -58,6 +58,8 @@ [\fB\-\-checksums\fR md5|sha1|sha256|none] .br [\fB\-\-compression\fR bzip2|gzip|lzip|none] +.br + [\fB\-\-config\fR \fIGIT_URL\fR] .br [\fB\-\-build\-with\-chroot\fR true|false] .br @@ -301,6 +303,8 @@ sets which stages should be cached. By default set to bootstrap. As an exception 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 together with their checksums. This in turn can be used by live\-boots built\-in integrity\-check to verify the medium if specified at boot prompt. In general, this should not be false and is an important feature of live system released to the public. However, during development of very big images it can save some time by not calculating the checksums. .IP "\fB\-\-compression\fR bzip2|gzip|lzip|none" 4 defines the compression program to be used to compress tarballs. Defaults to gzip. +.IP "\fB\-\-config\fR \fIGIT_URL\fR" 4 +allows to bootstrap a config tree from a git repositories. .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|jffs2|none" 4 diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po index 0e5a83a46..af248c02d 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-07-28 18:55+0300\n" +"POT-Creation-Date: 2012-07-28 19:16+0300\n" "PO-Revision-Date: 2012-02-04 21:39+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -217,7 +217,7 @@ msgstr "" #: en/lb_chroot_packagelists.1:9 en/lb_chroot_packages.1:9 #: en/lb_chroot_proc.1:9 en/lb_chroot_resolv.1:9 en/lb_chroot_selinuxfs.1:9 #: en/lb_chroot_sysfs.1:9 en/lb_chroot_sysv-rc.1:9 en/lb_chroot_task-lists.1:9 -#: en/lb_chroot_upstart.1:9 en/lb_clean.1:9 en/lb_config.1:241 +#: en/lb_chroot_upstart.1:9 en/lb_clean.1:9 en/lb_config.1:243 #: en/lb_source.1:9 en/lb_source_checksums.1:9 en/lb_source_debian-live.1:9 #: en/lb_source_debian.1:9 en/lb_source_disk.1:9 en/lb_source_hdd.1:9 #: en/lb_source_iso.1:9 en/lb_source_tar.1:9 en/lb_source_virtual-hdd.1:9 @@ -249,7 +249,7 @@ msgstr "" #: en/lb_chroot_packages.1:14 en/lb_chroot_proc.1:14 en/lb_chroot_resolv.1:14 #: en/lb_chroot_selinuxfs.1:14 en/lb_chroot_sysfs.1:14 #: en/lb_chroot_sysv-rc.1:14 en/lb_chroot_task-lists.1:14 -#: en/lb_chroot_upstart.1:14 en/lb_clean.1:16 en/lb_config.1:250 +#: en/lb_chroot_upstart.1:14 en/lb_clean.1:16 en/lb_config.1:252 #: en/lb_source.1:14 en/lb_source_checksums.1:14 en/lb_source_debian-live.1:14 #: en/lb_source_debian.1:14 en/lb_source_disk.1:14 en/lb_source_hdd.1:14 #: en/lb_source_iso.1:14 en/lb_source_tar.1:14 en/lb_source_virtual-hdd.1:14 @@ -281,7 +281,7 @@ msgstr "" #: en/lb_chroot_packages.1:17 en/lb_chroot_proc.1:17 en/lb_chroot_resolv.1:17 #: en/lb_chroot_selinuxfs.1:17 en/lb_chroot_sysfs.1:17 #: en/lb_chroot_sysv-rc.1:17 en/lb_chroot_task-lists.1:17 -#: en/lb_chroot_upstart.1:17 en/lb_clean.1:38 en/lb_config.1:498 +#: en/lb_chroot_upstart.1:17 en/lb_clean.1:38 en/lb_config.1:502 #: en/lb_source.1:17 en/lb_source_checksums.1:17 en/lb_source_debian-live.1:17 #: en/lb_source_debian.1:17 en/lb_source_disk.1:17 en/lb_source_hdd.1:17 #: en/lb_source_iso.1:17 en/lb_source_tar.1:17 en/lb_source_virtual-hdd.1:17 @@ -313,7 +313,7 @@ msgstr "" #: en/lb_chroot_packages.1:21 en/lb_chroot_proc.1:21 en/lb_chroot_resolv.1:21 #: en/lb_chroot_selinuxfs.1:21 en/lb_chroot_sysfs.1:21 #: en/lb_chroot_sysv-rc.1:21 en/lb_chroot_task-lists.1:21 -#: en/lb_chroot_upstart.1:21 en/lb_clean.1:43 en/lb_config.1:505 +#: en/lb_chroot_upstart.1:21 en/lb_clean.1:43 en/lb_config.1:509 #: en/lb_source.1:20 en/lb_source_checksums.1:21 en/lb_source_debian-live.1:21 #: en/lb_source_debian.1:21 en/lb_source_disk.1:21 en/lb_source_hdd.1:21 #: en/lb_source_iso.1:21 en/lb_source_tar.1:21 en/lb_source_virtual-hdd.1:21 @@ -345,7 +345,7 @@ msgstr "" #: en/lb_chroot_packages.1:23 en/lb_chroot_proc.1:23 en/lb_chroot_resolv.1:23 #: en/lb_chroot_selinuxfs.1:23 en/lb_chroot_sysfs.1:23 #: en/lb_chroot_sysv-rc.1:23 en/lb_chroot_task-lists.1:23 -#: en/lb_chroot_upstart.1:23 en/lb_clean.1:45 en/lb_config.1:507 +#: en/lb_chroot_upstart.1:23 en/lb_clean.1:45 en/lb_config.1:511 #: en/lb_source.1:22 en/lb_source_checksums.1:23 en/lb_source_debian-live.1:23 #: en/lb_source_debian.1:23 en/lb_source_disk.1:23 en/lb_source_hdd.1:23 #: en/lb_source_iso.1:23 en/lb_source_tar.1:23 en/lb_source_virtual-hdd.1:23 @@ -376,7 +376,7 @@ msgstr "" #: en/lb_chroot_packages.1:25 en/lb_chroot_proc.1:25 en/lb_chroot_resolv.1:25 #: en/lb_chroot_selinuxfs.1:25 en/lb_chroot_sysfs.1:25 #: en/lb_chroot_sysv-rc.1:25 en/lb_chroot_task-lists.1:25 -#: en/lb_chroot_upstart.1:25 en/lb_clean.1:47 en/lb_config.1:513 +#: en/lb_chroot_upstart.1:25 en/lb_clean.1:47 en/lb_config.1:517 #: en/lb_source.1:24 en/lb_source_checksums.1:25 en/lb_source_debian-live.1:25 #: en/lb_source_debian.1:25 en/lb_source_disk.1:25 en/lb_source_hdd.1:25 #: en/lb_source_iso.1:25 en/lb_source_tar.1:25 en/lb_source_virtual-hdd.1:25 @@ -407,7 +407,7 @@ msgstr "" #: en/lb_chroot_packages.1:26 en/lb_chroot_proc.1:26 en/lb_chroot_resolv.1:26 #: en/lb_chroot_selinuxfs.1:26 en/lb_chroot_sysfs.1:26 #: en/lb_chroot_sysv-rc.1:26 en/lb_chroot_task-lists.1:26 -#: en/lb_chroot_upstart.1:26 en/lb_clean.1:48 en/lb_config.1:514 +#: en/lb_chroot_upstart.1:26 en/lb_clean.1:48 en/lb_config.1:518 #: en/lb_source.1:25 en/lb_source_checksums.1:26 en/lb_source_debian-live.1:26 #: en/lb_source_debian.1:26 en/lb_source_disk.1:26 en/lb_source_hdd.1:26 #: en/lb_source_iso.1:26 en/lb_source_tar.1:26 en/lb_source_virtual-hdd.1:26 @@ -439,7 +439,7 @@ msgstr "" #: en/lb_chroot_packages.1:28 en/lb_chroot_proc.1:28 en/lb_chroot_resolv.1:28 #: en/lb_chroot_selinuxfs.1:28 en/lb_chroot_sysfs.1:28 #: en/lb_chroot_sysv-rc.1:28 en/lb_chroot_task-lists.1:28 -#: en/lb_chroot_upstart.1:28 en/lb_clean.1:50 en/lb_config.1:516 +#: en/lb_chroot_upstart.1:28 en/lb_clean.1:50 en/lb_config.1:520 #: en/lb_source.1:27 en/lb_source_checksums.1:28 en/lb_source_debian-live.1:28 #: en/lb_source_debian.1:28 en/lb_source_disk.1:28 en/lb_source_hdd.1:28 #: en/lb_source_iso.1:28 en/lb_source_tar.1:28 en/lb_source_virtual-hdd.1:28 @@ -473,7 +473,7 @@ msgstr "" #: en/lb_chroot_packages.1:29 en/lb_chroot_proc.1:29 en/lb_chroot_resolv.1:29 #: en/lb_chroot_selinuxfs.1:29 en/lb_chroot_sysfs.1:29 #: en/lb_chroot_sysv-rc.1:29 en/lb_chroot_task-lists.1:29 -#: en/lb_chroot_upstart.1:29 en/lb_clean.1:51 en/lb_config.1:517 +#: en/lb_chroot_upstart.1:29 en/lb_clean.1:51 en/lb_config.1:521 #: en/lb_source.1:28 en/lb_source_checksums.1:29 en/lb_source_debian-live.1:29 #: en/lb_source_debian.1:29 en/lb_source_disk.1:29 en/lb_source_hdd.1:29 #: en/lb_source_iso.1:29 en/lb_source_tar.1:29 en/lb_source_virtual-hdd.1:29 @@ -505,7 +505,7 @@ msgstr "" #: en/lb_chroot_packages.1:31 en/lb_chroot_proc.1:31 en/lb_chroot_resolv.1:31 #: en/lb_chroot_selinuxfs.1:31 en/lb_chroot_sysfs.1:31 #: en/lb_chroot_sysv-rc.1:31 en/lb_chroot_task-lists.1:31 -#: en/lb_chroot_upstart.1:31 en/lb_clean.1:53 en/lb_config.1:519 +#: en/lb_chroot_upstart.1:31 en/lb_clean.1:53 en/lb_config.1:523 #: en/lb_source.1:30 en/lb_source_checksums.1:31 en/lb_source_debian-live.1:31 #: en/lb_source_debian.1:31 en/lb_source_disk.1:31 en/lb_source_hdd.1:31 #: en/lb_source_iso.1:31 en/lb_source_tar.1:31 en/lb_source_virtual-hdd.1:31 @@ -540,7 +540,7 @@ msgstr "" #: en/lb_chroot_packages.1:32 en/lb_chroot_proc.1:32 en/lb_chroot_resolv.1:32 #: en/lb_chroot_selinuxfs.1:32 en/lb_chroot_sysfs.1:32 #: en/lb_chroot_sysv-rc.1:32 en/lb_chroot_task-lists.1:32 -#: en/lb_chroot_upstart.1:32 en/lb_clean.1:54 en/lb_config.1:520 +#: en/lb_chroot_upstart.1:32 en/lb_clean.1:54 en/lb_config.1:524 #: en/lb_source.1:31 en/lb_source_checksums.1:32 en/lb_source_debian-live.1:32 #: en/lb_source_debian.1:32 en/lb_source_disk.1:32 en/lb_source_hdd.1:32 #: en/lb_source_iso.1:32 en/lb_source_tar.1:32 en/lb_source_virtual-hdd.1:32 @@ -572,7 +572,7 @@ msgstr "" #: en/lb_chroot_packages.1:33 en/lb_chroot_proc.1:33 en/lb_chroot_resolv.1:33 #: en/lb_chroot_selinuxfs.1:33 en/lb_chroot_sysfs.1:33 #: en/lb_chroot_sysv-rc.1:33 en/lb_chroot_task-lists.1:33 -#: en/lb_chroot_upstart.1:33 en/lb_clean.1:55 en/lb_config.1:521 +#: en/lb_chroot_upstart.1:33 en/lb_clean.1:55 en/lb_config.1:525 #: en/lb_source.1:32 en/lb_source_checksums.1:33 en/lb_source_debian-live.1:33 #: en/lb_source_debian.1:33 en/lb_source_disk.1:33 en/lb_source_hdd.1:33 #: en/lb_source_iso.1:33 en/lb_source_tar.1:33 en/lb_source_virtual-hdd.1:33 @@ -725,455 +725,460 @@ msgstr "" #. type: Plain text #: en/lb_config.1:63 -msgid " [B<--build-with-chroot> true|false]" +msgid " [B<--config> I]" msgstr "" #. type: Plain text #: en/lb_config.1:65 -msgid " [B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none]" +msgid " [B<--build-with-chroot> true|false]" msgstr "" #. type: Plain text #: en/lb_config.1:67 -msgid " [B<--clean>]" +msgid " [B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none]" msgstr "" #. type: Plain text #: en/lb_config.1:69 -msgid " [-c|B<--conffile> I]" +msgid " [B<--clean>]" msgstr "" #. type: Plain text #: en/lb_config.1:71 -msgid " [B<--debconf-frontend> dialog|editor|noninteractive|readline]" +msgid " [-c|B<--conffile> I]" msgstr "" #. type: Plain text #: en/lb_config.1:73 -msgid " [B<--debconf-nowarnings> true|false]" +msgid " [B<--debconf-frontend> dialog|editor|noninteractive|readline]" msgstr "" #. type: Plain text #: en/lb_config.1:75 -msgid " [B<--debconf-priority> low|medium|high|critical]" +msgid " [B<--debconf-nowarnings> true|false]" msgstr "" #. type: Plain text #: en/lb_config.1:77 +msgid " [B<--debconf-priority> low|medium|high|critical]" +msgstr "" + +#. type: Plain text +#: en/lb_config.1:79 msgid "" " [B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false]" msgstr "" #. type: Plain text -#: en/lb_config.1:79 +#: en/lb_config.1:81 msgid " [B<--debian-installer-distribution> daily|I]" msgstr "" #. type: Plain text -#: en/lb_config.1:81 +#: en/lb_config.1:83 msgid " [B<--debian-installer-preseedfile> I|I]" msgstr "" #. type: Plain text -#: en/lb_config.1:83 +#: en/lb_config.1:85 msgid " [B<--debian-installer-gui> true|false]" msgstr "" #. type: Plain text -#: en/lb_config.1:85 +#: en/lb_config.1:87 msgid " [B<--debug>]" msgstr "" #. type: Plain text -#: en/lb_config.1:87 +#: en/lb_config.1:89 msgid " [-d|B<--distribution> I]" msgstr "" #. type: Plain text -#: en/lb_config.1:89 +#: en/lb_config.1:91 msgid " [B<--parent-distribution> I]" msgstr "" #. type: Plain text -#: en/lb_config.1:91 +#: en/lb_config.1:93 msgid " [B<--parent-debian-installer-distribution> I]" msgstr "" #. type: Plain text -#: en/lb_config.1:93 +#: en/lb_config.1:95 msgid " [B<--dump>]" msgstr "" #. type: Plain text -#: en/lb_config.1:95 +#: en/lb_config.1:97 msgid " [B<--fdisk> fdisk|fdisk.dist]" msgstr "" #. type: Plain text -#: en/lb_config.1:97 +#: en/lb_config.1:99 msgid " [B<--firmware-binary true|false>]" msgstr "" #. type: Plain text -#: en/lb_config.1:99 +#: en/lb_config.1:101 msgid " [B<--firmware-chroot true|false>]" msgstr "" #. type: Plain text -#: en/lb_config.1:101 +#: en/lb_config.1:103 msgid " [B<--force>]" msgstr "" #. type: Plain text -#: en/lb_config.1:103 +#: en/lb_config.1:105 msgid " [B<--grub-splash> I]" msgstr "" #. type: Plain text -#: en/lb_config.1:105 +#: en/lb_config.1:107 msgid " [B<--gzip-options> I