diff --git a/functions/defaults.sh b/functions/defaults.sh index 9649db7b4..800ffdced 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -377,9 +377,6 @@ Set_defaults () fi fi - # Setting bootstrap keyring - # LB_BOOTSTRAP_KEYRING - # Setting mirror to fetch packages from case "${LB_MODE}" in debian) diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1 index 82762519b..58191f042 100644 --- a/manpages/de/lb_config.de.1 +++ b/manpages/de/lb_config.de.1 @@ -47,8 +47,6 @@ [\fB\-\-bootloader\fP grub|syslinux|yaboot] .br [\fB\-\-bootstrap\fP cdebootstrap|cdebootstrap\-static|debootstrap|copy] -.br - [\fB\-\-bootstrap\-keyring\fP \fIPACKAGE\fP] .br [\fB\-\-cache\fP true|false] .br @@ -352,9 +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 "\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. diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1 index bf8611a06..9e4190ee4 100644 --- a/manpages/en/lb_config.1 +++ b/manpages/en/lb_config.1 @@ -42,8 +42,6 @@ [\fB\-\-bootloader\fR grub|syslinux|yaboot] .br [\fB\-\-bootstrap\fR cdebootstrap|cdebootstrap-static|debootstrap|copy] -.br - [\fB\-\-bootstrap\-keyring\fR \fIPACKAGE\fR] .br [\fB\-\-cache\fR true|false] .br @@ -285,8 +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 "\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 diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po index a6c4e0950..b5b8a3c20 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-27 14:12+0300\n" +"POT-Creation-Date: 2012-08-27 14:35+0300\n" "PO-Revision-Date: 2012-08-02 18:55+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -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:241 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:250 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:498 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:505 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:507 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(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:513 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:514 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:516 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:517 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:519 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:520 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:521 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 EIE for " @@ -267,495 +267,490 @@ msgstr "" #. type: Plain text #: en/lb_config.1:47 -msgid " [B<--bootstrap-keyring> I]" -msgstr "" - -#. type: Plain text -#: en/lb_config.1:49 msgid " [B<--cache> true|false]" msgstr "" #. type: Plain text -#: en/lb_config.1:51 +#: en/lb_config.1:49 msgid " [B<--cache-indices> true|false]" msgstr "" #. type: Plain text -#: en/lb_config.1:53 +#: en/lb_config.1:51 msgid " [B<--cache-packages> true|false]" msgstr "" #. type: Plain text -#: en/lb_config.1:55 +#: en/lb_config.1:53 msgid " [B<--cache-stages> I|I<\"STAGES\">]" msgstr "" #. type: Plain text -#: en/lb_config.1:57 +#: en/lb_config.1:55 msgid " [B<--checksums> md5|sha1|sha256|none]" msgstr "" #. type: Plain text -#: en/lb_config.1:59 +#: en/lb_config.1:57 msgid " [B<--compression> bzip2|gzip|lzip|none]" msgstr "" #. type: Plain text -#: en/lb_config.1:61 +#: en/lb_config.1:59 msgid " [B<--config> I]" msgstr "" #. type: Plain text -#: en/lb_config.1:63 +#: en/lb_config.1:61 msgid " [B<--build-with-chroot> true|false]" msgstr "" #. type: Plain text -#: en/lb_config.1:65 +#: en/lb_config.1:63 msgid " [B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none]" msgstr "" #. type: Plain text -#: en/lb_config.1:67 +#: en/lb_config.1:65 msgid " [B<--clean>]" msgstr "" #. type: Plain text -#: en/lb_config.1:69 +#: en/lb_config.1:67 msgid " [-c|B<--conffile> I]" msgstr "" #. type: Plain text -#: en/lb_config.1:71 +#: en/lb_config.1:69 msgid " [B<--debconf-frontend> dialog|editor|noninteractive|readline]" msgstr "" #. type: Plain text -#: en/lb_config.1:73 +#: en/lb_config.1:71 msgid " [B<--debconf-nowarnings> true|false]" msgstr "" #. type: Plain text -#: en/lb_config.1:75 +#: en/lb_config.1:73 msgid " [B<--debconf-priority> low|medium|high|critical]" msgstr "" #. type: Plain text -#: en/lb_config.1:77 +#: en/lb_config.1:75 msgid "" " [B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false]" msgstr "" #. type: Plain text -#: en/lb_config.1:79 +#: en/lb_config.1:77 msgid " [B<--debian-installer-distribution> daily|I]" msgstr "" #. type: Plain text -#: en/lb_config.1:81 +#: en/lb_config.1:79 msgid " [B<--debian-installer-preseedfile> I|I]" msgstr "" #. type: Plain text -#: en/lb_config.1:83 +#: en/lb_config.1:81 msgid " [B<--debian-installer-gui> true|false]" msgstr "" #. type: Plain text -#: en/lb_config.1:85 +#: en/lb_config.1:83 msgid " [B<--debug>]" msgstr "" #. type: Plain text -#: en/lb_config.1:87 +#: en/lb_config.1:85 msgid " [-d|B<--distribution> I]" msgstr "" #. type: Plain text -#: en/lb_config.1:89 +#: en/lb_config.1:87 msgid " [B<--parent-distribution> I]" msgstr "" #. type: Plain text -#: en/lb_config.1:91 +#: en/lb_config.1:89 msgid " [B<--parent-debian-installer-distribution> I]" msgstr "" #. type: Plain text -#: en/lb_config.1:93 +#: en/lb_config.1:91 msgid " [B<--dump>]" msgstr "" #. type: Plain text -#: en/lb_config.1:95 +#: en/lb_config.1:93 msgid " [B<--fdisk> fdisk|fdisk.dist]" msgstr "" #. type: Plain text -#: en/lb_config.1:97 +#: en/lb_config.1:95 msgid " [B<--firmware-binary true|false>]" msgstr "" #. type: Plain text -#: en/lb_config.1:99 +#: en/lb_config.1:97 msgid " [B<--firmware-chroot true|false>]" msgstr "" #. type: Plain text -#: en/lb_config.1:101 +#: en/lb_config.1:99 msgid " [B<--force>]" msgstr "" #. type: Plain text -#: en/lb_config.1:103 +#: en/lb_config.1:101 msgid " [B<--grub-splash> I]" msgstr "" #. type: Plain text -#: en/lb_config.1:105 +#: en/lb_config.1:103 msgid " [B<--gzip-options> I