diff options
| -rwxr-xr-x | examples/hooks/all_chroot_losetup-lukshome.sh | 6 | ||||
| -rw-r--r-- | manpages/de/lb_config.de.1 | 21 | ||||
| -rw-r--r-- | manpages/de/live-build.de.7 | 4 | ||||
| -rw-r--r-- | manpages/en/lb_config.1 | 12 | ||||
| -rw-r--r-- | manpages/en/live-build.7 | 4 | ||||
| -rw-r--r-- | manpages/po/de/lb_config.1.po | 44 | ||||
| -rw-r--r-- | manpages/po/de/live-build.7.po | 23 | ||||
| -rw-r--r-- | manpages/pot/lb_config.1.pot | 44 | ||||
| -rw-r--r-- | manpages/pot/live-build.7.pot | 23 | ||||
| -rwxr-xr-x | scripts/build/lb_binary_grub | 8 | ||||
| -rwxr-xr-x | scripts/build/lb_binary_grub2 | 8 | ||||
| -rwxr-xr-x | scripts/build/lb_binary_linux-image | 8 | ||||
| -rwxr-xr-x | scripts/build/lb_binary_manifest | 2 | ||||
| -rwxr-xr-x | scripts/build/lb_binary_memtest | 2 | ||||
| -rwxr-xr-x | scripts/build/lb_binary_net | 2 | ||||
| -rwxr-xr-x | scripts/build/lb_binary_rootfs | 2 | ||||
| -rwxr-xr-x | scripts/build/lb_binary_silo | 6 | ||||
| -rwxr-xr-x | scripts/build/lb_binary_yaboot | 8 | ||||
| -rwxr-xr-x | scripts/build/lb_chroot_hacks | 4 | ||||
| -rwxr-xr-x | scripts/build/lb_chroot_linux-image | 2 | ||||
| -rwxr-xr-x | scripts/build/lb_config | 2 |
21 files changed, 125 insertions, 110 deletions
diff --git a/examples/hooks/all_chroot_losetup-lukshome.sh b/examples/hooks/all_chroot_losetup-lukshome.sh index b5e372638..f8492d72a 100755 --- a/examples/hooks/all_chroot_losetup-lukshome.sh +++ b/examples/hooks/all_chroot_losetup-lukshome.sh @@ -28,7 +28,7 @@ # umounted. # # /usr/share/initramfs-tools/scripts/live-bottom/13live_luks_home -# a live-initramfs hook to execute lukshome.sh script +# a live-boot hook to execute lukshome.sh script # in initrd. # # @@ -300,7 +300,7 @@ echo "I: creating script /usr/local/sbin/lukshome.sh" cat > /usr/local/sbin/lukshome.sh << 'EOF' #!/bin/sh -# this script is to be executed by a hook in live-initramfs. It searches +# this script is to be executed by a hook in live-boot. It searches # for a partition with 'lukshome' label, mounts it as /luks-home, then opens an # encrypted disk image file called luks-home.img as a loopback device, opens it # with cryptsetup and finally mounts the present filesystem as /home. @@ -419,7 +419,7 @@ esac . /scripts/live-functions -# live-initramfs hook to use an disk image file with encrypted filesystem as /home. +# live-boot hook to use an disk image file with encrypted filesystem as /home. log_begin_msg "Executing losetup-lukshome" diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1 index 2843aa59a..c774fb34f 100644 --- a/manpages/de/lb_config.de.1 +++ b/manpages/de/lb_config.de.1 @@ -108,7 +108,7 @@ .br [\fB\-\-includes\fP \fIPATH\fP] .br - [\fB\-\-initramfs\fP auto|none|live\-boot|live\-initramfs|casper] + [\fB\-\-initramfs\fP auto|none|live\-boot|casper] .br [\fB\-\-interactive\fP shell] .br @@ -312,8 +312,9 @@ sets boot parameters specific to debian\-installer, if included. .IP "\fB\-\-bootappend\-live\fP \fIPARAMETER\fP|\(dq\fIPARAMETERS\fP\(dq" 4 sets boot parameters specific to debian\-live. A complete list of boot parameters can be found, for etch, in the manpage of casper, for all other -distributions in the manpage of live\-initramfs. On the images, a list of all -parameters (without comments) is included in the /parameters.txt. +distributions in the manpage of live\-boot and live\-config. On the images, a +list of all parameters (without comments) is included in the +/parameters.txt. .IP "\fB\-\-bootloader\fP 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 @@ -365,7 +366,7 @@ the time. .IP "\fB\-\-checksums\fP md5|sha1|sha256|none" 4 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\-initramfs' +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 @@ -470,13 +471,13 @@ sets the path to the includes that live\-build is going to use, e.g. additional minimal documentation that you want to have on all live systems. By default, this is set to /usr/share/live/build/includes/. Choose none to disable inclusion of documentation. -.IP "\fB\-\-initramfs\fP auto|none|live\-boot|live\-initramfs|casper" 4 +.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 the image rather than on configuration time, the value will be expanded to -casper when building ubuntu systems, to live\-boot for debian systems. Using -\&'none' is useful if the resulting system image should not be a live image -(experimental). +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\-\-interactive\fP shell" 4 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 @@ -613,8 +614,8 @@ sets additional options for mounting the copy\-on\-write layer in netboot images and is by default empty. .IP "\fB\-\-net\-cow\-path\fP \fIPATH\fP" 4 defines the path to client writable filesystem. Anywhere that -\fIclient_mac_address\fP is specified in the path live\-initramfs will -substitute the MAC address of the client delimited with hyphens. +\fIclient_mac_address\fP is specified in the path live\-boot will substitute the +MAC address of the client delimited with hyphens. .PP .IP "" 4 Example: diff --git a/manpages/de/live-build.de.7 b/manpages/de/live-build.de.7 index 75195995d..bab153f77 100644 --- a/manpages/de/live-build.de.7 +++ b/manpages/de/live-build.de.7 @@ -283,7 +283,9 @@ also put comments in these files; lines beginning with "#" are ignored. .\" FIXME .SH "SEE ALSO" -\fIlive\-initramfs\fP(7) +\fIlive\-boot\fP(7) +.PP +\fIlive\-config\fP(7) .PP This program is a part of live\-build. diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1 index 26645594c..e4c8a0752 100644 --- a/manpages/en/lb_config.1 +++ b/manpages/en/lb_config.1 @@ -103,7 +103,7 @@ .br [\fB\-\-includes\fR \fIPATH\fR] .br - [\fB\-\-initramfs\fR auto|none|live\-boot|live\-initramfs|casper] + [\fB\-\-initramfs\fR auto|none|live\-boot|casper] .br [\fB\-\-interactive\fR shell] .br @@ -258,7 +258,7 @@ defines the filesystem to be used in the image type. This only has an effect if .IP "\fB\-\-bootappend\-install\fR \fIPARAMETER\fR|""\fIPARAMETERS\fR""" 4 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, for etch, in the manpage of casper, for all other distributions in the manpage of live\-initramfs. On the images, a list of all parameters (without comments) is included in the /parameters.txt. +sets boot parameters specific to debian\-live. A complete list of boot parameters can be found, for etch, in the manpage of casper, for all other distributions in the manpage of live\-boot and live\-config. On the images, a list of all parameters (without comments) is included in the /parameters.txt. .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 usb\-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 @@ -278,7 +278,7 @@ defines if downloaded packages files should be cached which is true by default. .IP "\fB\-\-cache\-stages\fR true|false|\fISTAGE\fR|""\fISTAGES\fR""" 4 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 only cache the generated root filesystem in filesystem.{dir,ext*,squashfs}. This is useful during development if you want to rebuild the binary stage but not regenerate the root filesystem all the time. .IP "\fB\-\-checksums\fR md5|sha1|sha256|none" 4 -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\-initramfs' 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. +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\-\-build\-with\-chroot\fR true|false" 4 @@ -325,8 +325,8 @@ sets the hostname of the live system. \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. .IP "\fB\-\-includes\fR \fIPATH|none\fR" 4 sets the path to the includes that live\-build is going to use, e.g. additional minimal documentation that you want to have on all live systems. By default, this is set to /usr/share/live/build/includes/. Choose none to disable inclusion of documentation. -.IP "\fB\-\-initramfs\fR auto|none|live\-boot|live\-initramfs|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 debian systems. Using 'none' is useful if the resulting system image should not be a live image (experimental). +.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\-\-interactive\fR shell" 4 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 allow you to do manual customizations. Once you close the shell with logout or exit, the build will continue as usual. Note that it's strongly discouraged to use this for anything else than testing. Modifications that should be present in all builds of a live system should be properly made through hooks. Everything else destroys the beauty of being able to completely automatise the build process and making it non interactive. By default, this is of course false. .IP "\fB\-\-isohybrid\-options\fR \fIOPTION\fR|""\fIOPTIONS\fR""" 4 @@ -388,7 +388,7 @@ defines the filesystem type for the copy\-on\-write layer and defaults to nfs. .IP "\fB\-\-net\-cow\-mountoptions\fR \fIOPTIONS\fR" 4 sets additional options for mounting the copy\-on\-write layer in netboot images and is by default empty. .IP "\fB\-\-net\-cow\-path\fR \fIPATH\fR" 4 -defines the path to client writable filesystem. Anywhere that \fIclient_mac_address\fR is specified in the path live\-initramfs will substitute the MAC address of the client delimited with hyphens. +defines the path to client writable filesystem. Anywhere that \fIclient_mac_address\fR is specified in the path live\-boot will substitute the MAC address of the client delimited with hyphens. .PP .IP "" 4 Example: diff --git a/manpages/en/live-build.7 b/manpages/en/live-build.7 index 7f48369f1..ee1926467 100644 --- a/manpages/en/live-build.7 +++ b/manpages/en/live-build.7 @@ -236,7 +236,9 @@ All config files are shell scripts which are sourced by a live\-build program. T .\" FIXME .SH SEE ALSO -\fIlive\-initramfs\fR(7) +\fIlive\-boot\fR(7) +.PP +\fIlive\-config\fR(7) .PP This program is a part of live\-build. diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po index b826ebb35..8cf9d9059 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: 2011-01-02 01:12+0100\n" +"POT-Creation-Date: 2011-01-02 10:31+0100\n" "PO-Revision-Date: 2011-01-02 01:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -434,7 +434,7 @@ msgstr "" #: en/lb_source_debian-live.1:25 en/lb_source_debian.1:25 #: en/lb_source_disk.1:25 en/lb_source_iso.1:25 en/lb_source_net.1:25 #: en/lb_source_tar.1:25 en/lb_source_usb.1:25 en/lb_source_virtual-hdd.1:25 -#: en/lb_testroot.1:28 en/live-build.7:242 +#: en/lb_testroot.1:28 en/live-build.7:244 msgid "This program is a part of live-build." msgstr "" @@ -470,7 +470,7 @@ msgstr "" #: en/lb_source_debian-live.1:26 en/lb_source_debian.1:26 #: en/lb_source_disk.1:26 en/lb_source_iso.1:26 en/lb_source_net.1:26 #: en/lb_source_tar.1:26 en/lb_source_usb.1:26 en/lb_source_virtual-hdd.1:26 -#: en/lb_testroot.1:29 en/live-build.7:243 +#: en/lb_testroot.1:29 en/live-build.7:245 #, no-wrap msgid "HOMEPAGE" msgstr "" @@ -507,7 +507,7 @@ msgstr "" #: en/lb_source_debian-live.1:28 en/lb_source_debian.1:28 #: en/lb_source_disk.1:28 en/lb_source_iso.1:28 en/lb_source_net.1:28 #: en/lb_source_tar.1:28 en/lb_source_usb.1:28 en/lb_source_virtual-hdd.1:28 -#: en/lb_testroot.1:31 en/live-build.7:245 +#: en/lb_testroot.1:31 en/live-build.7:247 msgid "" "More information about live-build and the Debian Live project can be found " "on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at " @@ -546,7 +546,7 @@ msgstr "" #: en/lb_source_debian-live.1:29 en/lb_source_debian.1:29 #: en/lb_source_disk.1:29 en/lb_source_iso.1:29 en/lb_source_net.1:29 #: en/lb_source_tar.1:29 en/lb_source_usb.1:29 en/lb_source_virtual-hdd.1:29 -#: en/lb_testroot.1:32 en/live-build.7:246 +#: en/lb_testroot.1:32 en/live-build.7:248 #, no-wrap msgid "BUGS" msgstr "" @@ -583,7 +583,7 @@ msgstr "" #: en/lb_source_debian-live.1:31 en/lb_source_debian.1:31 #: en/lb_source_disk.1:31 en/lb_source_iso.1:31 en/lb_source_net.1:31 #: en/lb_source_tar.1:31 en/lb_source_usb.1:31 en/lb_source_virtual-hdd.1:31 -#: en/lb_testroot.1:34 en/live-build.7:248 +#: en/lb_testroot.1:34 en/live-build.7:250 msgid "" "Bugs can be reported by submitting a bugreport for the live-build package in " "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by " @@ -623,7 +623,7 @@ msgstr "" #: en/lb_source_debian-live.1:32 en/lb_source_debian.1:32 #: en/lb_source_disk.1:32 en/lb_source_iso.1:32 en/lb_source_net.1:32 #: en/lb_source_tar.1:32 en/lb_source_usb.1:32 en/lb_source_virtual-hdd.1:32 -#: en/lb_testroot.1:35 en/live-build.7:249 +#: en/lb_testroot.1:35 en/live-build.7:251 #, no-wrap msgid "AUTHOR" msgstr "" @@ -660,7 +660,7 @@ msgstr "" #: en/lb_source_debian-live.1:33 en/lb_source_debian.1:33 #: en/lb_source_disk.1:33 en/lb_source_iso.1:33 en/lb_source_net.1:33 #: en/lb_source_tar.1:33 en/lb_source_usb.1:33 en/lb_source_virtual-hdd.1:33 -#: en/lb_testroot.1:36 en/live-build.7:250 +#: en/lb_testroot.1:36 en/live-build.7:252 msgid "" "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for " "the Debian project." @@ -920,7 +920,7 @@ msgstr "" #. type: Plain text #: en/lb_config.1:107 -msgid " [B<--initramfs> auto|none|live-boot|live-initramfs|casper]" +msgid " [B<--initramfs> auto|none|live-boot|casper]" msgstr "" #. type: Plain text @@ -1443,8 +1443,8 @@ msgstr "" msgid "" "sets boot parameters specific to debian-live. A complete list of boot " "parameters can be found, for etch, in the manpage of casper, for all other " -"distributions in the manpage of live-initramfs. On the images, a list of all " -"parameters (without comments) is included in the /parameters.txt." +"distributions in the manpage of live-boot and live-config. On the images, a " +"list of all parameters (without comments) is included in the /parameters.txt." msgstr "" #. type: IP @@ -1595,11 +1595,11 @@ msgstr "" 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 " -"together with their checksums. This in turn can be used by live-initramfs' " -"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." +"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." msgstr "" #. type: IP @@ -1932,7 +1932,7 @@ msgstr "" #. type: IP #: en/lb_config.1:328 #, no-wrap -msgid "B<--initramfs> auto|none|live-boot|live-initramfs|casper" +msgid "B<--initramfs> auto|none|live-boot|casper" msgstr "" #. type: Plain text @@ -1941,9 +1941,9 @@ 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 " "the image rather than on configuration time, the value will be expanded to " -"casper when building ubuntu systems, to live-boot for debian systems. Using " -"'none' is useful if the resulting system image should not be a live image " -"(experimental)." +"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)." msgstr "" #. type: IP @@ -2387,8 +2387,8 @@ msgstr "" #: en/lb_config.1:392 msgid "" "defines the path to client writable filesystem. Anywhere that " -"I<client_mac_address> is specified in the path live-initramfs will " -"substitute the MAC address of the client delimited with hyphens." +"I<client_mac_address> is specified in the path live-boot will substitute the " +"MAC address of the client delimited with hyphens." msgstr "" #. type: Plain text diff --git a/manpages/po/de/live-build.7.po b/manpages/po/de/live-build.7.po index dc159349c..28295c1d9 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: 2011-01-02 01:12+0100\n" +"POT-Creation-Date: 2011-01-02 10:31+0100\n" "PO-Revision-Date: 2011-01-02 01:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -398,7 +398,7 @@ msgstr "" #: en/lb_source_debian-live.1:25 en/lb_source_debian.1:25 #: en/lb_source_disk.1:25 en/lb_source_iso.1:25 en/lb_source_net.1:25 #: en/lb_source_tar.1:25 en/lb_source_usb.1:25 en/lb_source_virtual-hdd.1:25 -#: en/lb_testroot.1:28 en/live-build.7:242 +#: en/lb_testroot.1:28 en/live-build.7:244 msgid "This program is a part of live-build." msgstr "" @@ -434,7 +434,7 @@ msgstr "" #: en/lb_source_debian-live.1:26 en/lb_source_debian.1:26 #: en/lb_source_disk.1:26 en/lb_source_iso.1:26 en/lb_source_net.1:26 #: en/lb_source_tar.1:26 en/lb_source_usb.1:26 en/lb_source_virtual-hdd.1:26 -#: en/lb_testroot.1:29 en/live-build.7:243 +#: en/lb_testroot.1:29 en/live-build.7:245 #, no-wrap msgid "HOMEPAGE" msgstr "" @@ -471,7 +471,7 @@ msgstr "" #: en/lb_source_debian-live.1:28 en/lb_source_debian.1:28 #: en/lb_source_disk.1:28 en/lb_source_iso.1:28 en/lb_source_net.1:28 #: en/lb_source_tar.1:28 en/lb_source_usb.1:28 en/lb_source_virtual-hdd.1:28 -#: en/lb_testroot.1:31 en/live-build.7:245 +#: en/lb_testroot.1:31 en/live-build.7:247 msgid "" "More information about live-build and the Debian Live project can be found " "on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at " @@ -510,7 +510,7 @@ msgstr "" #: en/lb_source_debian-live.1:29 en/lb_source_debian.1:29 #: en/lb_source_disk.1:29 en/lb_source_iso.1:29 en/lb_source_net.1:29 #: en/lb_source_tar.1:29 en/lb_source_usb.1:29 en/lb_source_virtual-hdd.1:29 -#: en/lb_testroot.1:32 en/live-build.7:246 +#: en/lb_testroot.1:32 en/live-build.7:248 #, no-wrap msgid "BUGS" msgstr "" @@ -547,7 +547,7 @@ msgstr "" #: en/lb_source_debian-live.1:31 en/lb_source_debian.1:31 #: en/lb_source_disk.1:31 en/lb_source_iso.1:31 en/lb_source_net.1:31 #: en/lb_source_tar.1:31 en/lb_source_usb.1:31 en/lb_source_virtual-hdd.1:31 -#: en/lb_testroot.1:34 en/live-build.7:248 +#: en/lb_testroot.1:34 en/live-build.7:250 msgid "" "Bugs can be reported by submitting a bugreport for the live-build package in " "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by " @@ -587,7 +587,7 @@ msgstr "" #: en/lb_source_debian-live.1:32 en/lb_source_debian.1:32 #: en/lb_source_disk.1:32 en/lb_source_iso.1:32 en/lb_source_net.1:32 #: en/lb_source_tar.1:32 en/lb_source_usb.1:32 en/lb_source_virtual-hdd.1:32 -#: en/lb_testroot.1:35 en/live-build.7:249 +#: en/lb_testroot.1:35 en/live-build.7:251 #, no-wrap msgid "AUTHOR" msgstr "" @@ -624,7 +624,7 @@ msgstr "" #: en/lb_source_debian-live.1:33 en/lb_source_debian.1:33 #: en/lb_source_disk.1:33 en/lb_source_iso.1:33 en/lb_source_net.1:33 #: en/lb_source_tar.1:33 en/lb_source_usb.1:33 en/lb_source_virtual-hdd.1:33 -#: en/lb_testroot.1:36 en/live-build.7:250 +#: en/lb_testroot.1:36 en/live-build.7:252 msgid "" "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for " "the Debian project." @@ -1805,5 +1805,10 @@ msgstr "" #. type: Plain text #: en/live-build.7:240 -msgid "I<live-initramfs>(7)" +msgid "I<live-boot>(7)" +msgstr "" + +#. type: Plain text +#: en/live-build.7:242 +msgid "I<live-config>(7)" msgstr "" diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot index af1e73dca..fc366a3a8 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: 2011-01-02 01:12+0100\n" +"POT-Creation-Date: 2011-01-02 10:31+0100\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" @@ -434,7 +434,7 @@ msgstr "" #: en/lb_source_debian-live.1:25 en/lb_source_debian.1:25 #: en/lb_source_disk.1:25 en/lb_source_iso.1:25 en/lb_source_net.1:25 #: en/lb_source_tar.1:25 en/lb_source_usb.1:25 en/lb_source_virtual-hdd.1:25 -#: en/lb_testroot.1:28 en/live-build.7:242 +#: en/lb_testroot.1:28 en/live-build.7:244 msgid "This program is a part of live-build." msgstr "" @@ -470,7 +470,7 @@ msgstr "" #: en/lb_source_debian-live.1:26 en/lb_source_debian.1:26 #: en/lb_source_disk.1:26 en/lb_source_iso.1:26 en/lb_source_net.1:26 #: en/lb_source_tar.1:26 en/lb_source_usb.1:26 en/lb_source_virtual-hdd.1:26 -#: en/lb_testroot.1:29 en/live-build.7:243 +#: en/lb_testroot.1:29 en/live-build.7:245 #, no-wrap msgid "HOMEPAGE" msgstr "" @@ -507,7 +507,7 @@ msgstr "" #: en/lb_source_debian-live.1:28 en/lb_source_debian.1:28 #: en/lb_source_disk.1:28 en/lb_source_iso.1:28 en/lb_source_net.1:28 #: en/lb_source_tar.1:28 en/lb_source_usb.1:28 en/lb_source_virtual-hdd.1:28 -#: en/lb_testroot.1:31 en/live-build.7:245 +#: en/lb_testroot.1:31 en/live-build.7:247 msgid "" "More information about live-build and the Debian Live project can be found " "on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at " @@ -546,7 +546,7 @@ msgstr "" #: en/lb_source_debian-live.1:29 en/lb_source_debian.1:29 #: en/lb_source_disk.1:29 en/lb_source_iso.1:29 en/lb_source_net.1:29 #: en/lb_source_tar.1:29 en/lb_source_usb.1:29 en/lb_source_virtual-hdd.1:29 -#: en/lb_testroot.1:32 en/live-build.7:246 +#: en/lb_testroot.1:32 en/live-build.7:248 #, no-wrap msgid "BUGS" msgstr "" @@ -583,7 +583,7 @@ msgstr "" #: en/lb_source_debian-live.1:31 en/lb_source_debian.1:31 #: en/lb_source_disk.1:31 en/lb_source_iso.1:31 en/lb_source_net.1:31 #: en/lb_source_tar.1:31 en/lb_source_usb.1:31 en/lb_source_virtual-hdd.1:31 -#: en/lb_testroot.1:34 en/live-build.7:248 +#: en/lb_testroot.1:34 en/live-build.7:250 msgid "" "Bugs can be reported by submitting a bugreport for the live-build package in " "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by " @@ -623,7 +623,7 @@ msgstr "" #: en/lb_source_debian-live.1:32 en/lb_source_debian.1:32 #: en/lb_source_disk.1:32 en/lb_source_iso.1:32 en/lb_source_net.1:32 #: en/lb_source_tar.1:32 en/lb_source_usb.1:32 en/lb_source_virtual-hdd.1:32 -#: en/lb_testroot.1:35 en/live-build.7:249 +#: en/lb_testroot.1:35 en/live-build.7:251 #, no-wrap msgid "AUTHOR" msgstr "" @@ -660,7 +660,7 @@ msgstr "" #: en/lb_source_debian-live.1:33 en/lb_source_debian.1:33 #: en/lb_source_disk.1:33 en/lb_source_iso.1:33 en/lb_source_net.1:33 #: en/lb_source_tar.1:33 en/lb_source_usb.1:33 en/lb_source_virtual-hdd.1:33 -#: en/lb_testroot.1:36 en/live-build.7:250 +#: en/lb_testroot.1:36 en/live-build.7:252 msgid "" "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for " "the Debian project." @@ -920,7 +920,7 @@ msgstr "" #. type: Plain text #: en/lb_config.1:107 -msgid " [B<--initramfs> auto|none|live-boot|live-initramfs|casper]" +msgid " [B<--initramfs> auto|none|live-boot|casper]" msgstr "" #. type: Plain text @@ -1443,8 +1443,8 @@ msgstr "" msgid "" "sets boot parameters specific to debian-live. A complete list of boot " "parameters can be found, for etch, in the manpage of casper, for all other " -"distributions in the manpage of live-initramfs. On the images, a list of all " -"parameters (without comments) is included in the /parameters.txt." +"distributions in the manpage of live-boot and live-config. On the images, a " +"list of all parameters (without comments) is included in the /parameters.txt." msgstr "" #. type: IP @@ -1595,11 +1595,11 @@ msgstr "" 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 " -"together with their checksums. This in turn can be used by live-initramfs' " -"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." +"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." msgstr "" #. type: IP @@ -1932,7 +1932,7 @@ msgstr "" #. type: IP #: en/lb_config.1:328 #, no-wrap -msgid "B<--initramfs> auto|none|live-boot|live-initramfs|casper" +msgid "B<--initramfs> auto|none|live-boot|casper" msgstr "" #. type: Plain text @@ -1941,9 +1941,9 @@ 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 " "the image rather than on configuration time, the value will be expanded to " -"casper when building ubuntu systems, to live-boot for debian systems. Using " -"'none' is useful if the resulting system image should not be a live image " -"(experimental)." +"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)." msgstr "" #. type: IP @@ -2387,8 +2387,8 @@ msgstr "" #: en/lb_config.1:392 msgid "" "defines the path to client writable filesystem. Anywhere that " -"I<client_mac_address> is specified in the path live-initramfs will " -"substitute the MAC address of the client delimited with hyphens." +"I<client_mac_address> is specified in the path live-boot will substitute the " +"MAC address of the client delimited with hyphens." msgstr "" #. type: Plain text diff --git a/manpages/pot/live-build.7.pot b/manpages/pot/live-build.7.pot index 19c24ebba..16759cf30 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: 2011-01-02 01:12+0100\n" +"POT-Creation-Date: 2011-01-02 10:31+0100\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" @@ -398,7 +398,7 @@ msgstr "" #: en/lb_source_debian-live.1:25 en/lb_source_debian.1:25 #: en/lb_source_disk.1:25 en/lb_source_iso.1:25 en/lb_source_net.1:25 #: en/lb_source_tar.1:25 en/lb_source_usb.1:25 en/lb_source_virtual-hdd.1:25 -#: en/lb_testroot.1:28 en/live-build.7:242 +#: en/lb_testroot.1:28 en/live-build.7:244 msgid "This program is a part of live-build." msgstr "" @@ -434,7 +434,7 @@ msgstr "" #: en/lb_source_debian-live.1:26 en/lb_source_debian.1:26 #: en/lb_source_disk.1:26 en/lb_source_iso.1:26 en/lb_source_net.1:26 #: en/lb_source_tar.1:26 en/lb_source_usb.1:26 en/lb_source_virtual-hdd.1:26 -#: en/lb_testroot.1:29 en/live-build.7:243 +#: en/lb_testroot.1:29 en/live-build.7:245 #, no-wrap msgid "HOMEPAGE" msgstr "" @@ -471,7 +471,7 @@ msgstr "" #: en/lb_source_debian-live.1:28 en/lb_source_debian.1:28 #: en/lb_source_disk.1:28 en/lb_source_iso.1:28 en/lb_source_net.1:28 #: en/lb_source_tar.1:28 en/lb_source_usb.1:28 en/lb_source_virtual-hdd.1:28 -#: en/lb_testroot.1:31 en/live-build.7:245 +#: en/lb_testroot.1:31 en/live-build.7:247 msgid "" "More information about live-build and the Debian Live project can be found " "on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at " @@ -510,7 +510,7 @@ msgstr "" #: en/lb_source_debian-live.1:29 en/lb_source_debian.1:29 #: en/lb_source_disk.1:29 en/lb_source_iso.1:29 en/lb_source_net.1:29 #: en/lb_source_tar.1:29 en/lb_source_usb.1:29 en/lb_source_virtual-hdd.1:29 -#: en/lb_testroot.1:32 en/live-build.7:246 +#: en/lb_testroot.1:32 en/live-build.7:248 #, no-wrap msgid "BUGS" msgstr "" @@ -547,7 +547,7 @@ msgstr "" #: en/lb_source_debian-live.1:31 en/lb_source_debian.1:31 #: en/lb_source_disk.1:31 en/lb_source_iso.1:31 en/lb_source_net.1:31 #: en/lb_source_tar.1:31 en/lb_source_usb.1:31 en/lb_source_virtual-hdd.1:31 -#: en/lb_testroot.1:34 en/live-build.7:248 +#: en/lb_testroot.1:34 en/live-build.7:250 msgid "" "Bugs can be reported by submitting a bugreport for the live-build package in " "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by " @@ -587,7 +587,7 @@ msgstr "" #: en/lb_source_debian-live.1:32 en/lb_source_debian.1:32 #: en/lb_source_disk.1:32 en/lb_source_iso.1:32 en/lb_source_net.1:32 #: en/lb_source_tar.1:32 en/lb_source_usb.1:32 en/lb_source_virtual-hdd.1:32 -#: en/lb_testroot.1:35 en/live-build.7:249 +#: en/lb_testroot.1:35 en/live-build.7:251 #, no-wrap msgid "AUTHOR" msgstr "" @@ -624,7 +624,7 @@ msgstr "" #: en/lb_source_debian-live.1:33 en/lb_source_debian.1:33 #: en/lb_source_disk.1:33 en/lb_source_iso.1:33 en/lb_source_net.1:33 #: en/lb_source_tar.1:33 en/lb_source_usb.1:33 en/lb_source_virtual-hdd.1:33 -#: en/lb_testroot.1:36 en/live-build.7:250 +#: en/lb_testroot.1:36 en/live-build.7:252 msgid "" "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for " "the Debian project." @@ -1805,5 +1805,10 @@ msgstr "" #. type: Plain text #: en/live-build.7:240 -msgid "I<live-initramfs>(7)" +msgid "I<live-boot>(7)" +msgstr "" + +#. type: Plain text +#: en/live-build.7:242 +msgid "I<live-config>(7)" msgstr "" diff --git a/scripts/build/lb_binary_grub b/scripts/build/lb_binary_grub index e6662fa28..d75b800db 100755 --- a/scripts/build/lb_binary_grub +++ b/scripts/build/lb_binary_grub @@ -122,7 +122,7 @@ case "${LB_INITRAMFS}" in INITFS="casper" ;; - live-initramfs|live-boot) + live-boot) INITFS="live" ;; esac @@ -135,7 +135,7 @@ case "${LB_BINARY_IMAGES}" in DESTDIR_LIVE="binary/casper" ;; - live-initramfs|live-boot) + live-boot) DESTDIR_LIVE="binary/live" ;; esac @@ -163,7 +163,7 @@ then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}" ;; - live-initramfs|live-boot) + live-boot) if [ "${LB_USERNAME}" != "user" ] then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}" @@ -179,7 +179,7 @@ then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}" ;; - live-initramfs|live-boot) + live-boot) if [ "${LB_HOSTNAME}" != "debian" ] then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}" diff --git a/scripts/build/lb_binary_grub2 b/scripts/build/lb_binary_grub2 index 34043cadf..5db05fe43 100755 --- a/scripts/build/lb_binary_grub2 +++ b/scripts/build/lb_binary_grub2 @@ -96,7 +96,7 @@ case "${LB_INITRAMFS}" in INITFS="casper" ;; - live-initramfs|live-boot) + live-boot) INITFS="live" ;; esac @@ -109,7 +109,7 @@ case "${LB_BINARY_IMAGES}" in DESTDIR_LIVE="binary/casper" ;; - live-initramfs|live-boot) + live-boot) DESTDIR_LIVE="binary/live" ;; esac @@ -137,7 +137,7 @@ then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}" ;; - live-initramfs|live-boot) + live-boot) if [ "${LB_USERNAME}" != "user" ] then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}" @@ -153,7 +153,7 @@ then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}" ;; - live-initramfs|live-boot) + live-boot) if [ "${LB_HOSTNAME}" != "debian" ] then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}" diff --git a/scripts/build/lb_binary_linux-image b/scripts/build/lb_binary_linux-image index ff82c8686..6fd43113b 100755 --- a/scripts/build/lb_binary_linux-image +++ b/scripts/build/lb_binary_linux-image @@ -48,7 +48,7 @@ case "${LB_INITRAMFS}" in DESTDIR="binary/casper" ;; - live-initramfs|live-boot) + live-boot) DESTDIR="binary/live" ;; @@ -77,10 +77,10 @@ cp chroot/boot/"${LINUX}"-* "${DESTDIR}" cp chroot/boot/initrd.img-* "${DESTDIR}" case "${LB_INITRAMFS}" in - live-initramfs|live-boot) - if [ -e chroot/usr/share/doc/live-initramfs/parameters.txt ] + live-boot) + if [ -e chroot/usr/share/doc/live-boot/parameters.txt ] then - cp chroot/usr/share/doc/live-initramfs/parameters.txt "${DESTDIR}"/parameters.txt + cp chroot/usr/share/doc/live-boot/parameters.txt "${DESTDIR}"/parameters fi ;; esac diff --git a/scripts/build/lb_binary_manifest b/scripts/build/lb_binary_manifest index 1c50f5804..ffa46b184 100755 --- a/scripts/build/lb_binary_manifest +++ b/scripts/build/lb_binary_manifest @@ -49,7 +49,7 @@ case "${LB_INITRAMFS}" in SUFFIX="manifest" ;; - live-initramfs|live-boot) + live-boot) INITFS="live" SUFFIX="packages" ;; diff --git a/scripts/build/lb_binary_memtest b/scripts/build/lb_binary_memtest index fade917b8..4572a5f99 100755 --- a/scripts/build/lb_binary_memtest +++ b/scripts/build/lb_binary_memtest @@ -84,7 +84,7 @@ case "${LB_INITRAMFS}" in DESTDIR="binary/casper" ;; - live-initramfs|live-boot) + live-boot) DESTDIR="binary/live" ;; esac diff --git a/scripts/build/lb_binary_net b/scripts/build/lb_binary_net index fd2770ebe..9d5e01cef 100755 --- a/scripts/build/lb_binary_net +++ b/scripts/build/lb_binary_net @@ -66,7 +66,7 @@ then ORIGDIR="binary/casper" ;; - live-initramfs|live-boot) + live-boot) ORIGDIR="binary/live" ;; esac diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs index b2dabe4ce..22aa430d1 100755 --- a/scripts/build/lb_binary_rootfs +++ b/scripts/build/lb_binary_rootfs @@ -53,7 +53,7 @@ case "${LB_INITRAMFS}" in INITFS="casper" ;; - live-initramfs|live-boot) + live-boot) INITFS="live" ;; esac diff --git a/scripts/build/lb_binary_silo b/scripts/build/lb_binary_silo index 653e0f405..104d864c5 100755 --- a/scripts/build/lb_binary_silo +++ b/scripts/build/lb_binary_silo @@ -113,7 +113,7 @@ case "${LB_INITRAMFS}" in DESTDIR_LIVE="binary/casper" ;; - live-initramfs|live-boot) + live-boot) INITFS="live" DESTDIR_LIVE="binary/live" ;; @@ -130,7 +130,7 @@ then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}" ;; - live-initramfs|live-boot) + live-boot) if [ "${LB_USERNAME}" != "user" ] then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}" @@ -146,7 +146,7 @@ then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}" ;; - live-initramfs|live-boot) + live-boot) if [ "${LB_HOSTNAME}" != "debian" ] then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}" diff --git a/scripts/build/lb_binary_yaboot b/scripts/build/lb_binary_yaboot index bfbb58a30..1e54e0c26 100755 --- a/scripts/build/lb_binary_yaboot +++ b/scripts/build/lb_binary_yaboot @@ -129,7 +129,7 @@ case "${LB_INITRAMFS}" in INITFS="casper" ;; - live-initramfs|live-boot) + live-boot) INITFS="live" ;; esac @@ -142,7 +142,7 @@ case "${LB_BINARY_IMAGES}" in DESTDIR_LIVE="binary/casper" ;; - live-initramfs|live-boot) + live-boot) DESTDIR_LIVE="binary/live" ;; esac @@ -169,7 +169,7 @@ then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}" ;; - live-initramfs|live-boot) + live-boot) if [ "${LB_USERNAME}" != "user" ] then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}" @@ -185,7 +185,7 @@ then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}" ;; - live-initramfs|live-boot) + live-boot) if [ "${LB_HOSTNAME}" != "debian" ] then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}" diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks index d5a7d7fbc..47524dbdc 100755 --- a/scripts/build/lb_chroot_hacks +++ b/scripts/build/lb_chroot_hacks @@ -163,7 +163,7 @@ case "${LB_INITRAMFS}" in UPDATE_INITRAMFS_OPTIONS="CASPER_GENERATE_UUID=1" ;; - live-initramfs|live-boot) + live-boot) #UPDATE_INITRAMFS_OPTIONS="LIVE_GENERATE_UUID=1" ;; esac @@ -198,7 +198,7 @@ case "${LB_INITRAMFS}" in ID="999" ;; - live-initramfs|live-boot) + live-boot) ID="1000" ;; esac diff --git a/scripts/build/lb_chroot_linux-image b/scripts/build/lb_chroot_linux-image index 507f3859d..b72ffb6b2 100755 --- a/scripts/build/lb_chroot_linux-image +++ b/scripts/build/lb_chroot_linux-image @@ -55,7 +55,7 @@ EOF # Diverting update-initramfs #case "${LB_INITRAMFS}" in - # live-initramfs|live-boot) + # live-boot) # mv chroot/usr/sbin/update-initramfs chroot/usr/sbin/update-initramfs.live-build # ;; #esac diff --git a/scripts/build/lb_config b/scripts/build/lb_config index 484b3a330..e61c86550 100755 --- a/scripts/build/lb_config +++ b/scripts/build/lb_config @@ -76,7 +76,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--hostname NAME]\n\ \t [--ignore-system-defaults]\n\ \t [--includes PATH|none]\n\ -\t [--initramfs auto|none|live-boot|live-initramfs|casper]\n\ +\t [--initramfs auto|none|live-boot|casper]\n\ \t [--interactive shell]\n\ \t [--isohybrid-options OPTION|\"OPTIONS\"]\n\ \t [--iso-application NAME]\n\ |