From: Daniel Baumann Date: Sun, 8 Apr 2012 17:38:47 +0000 (+0200) Subject: Renaming live.persist to live-persistence.conf. X-Git-Tag: debian/3.0_a27-1~15 X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=315900ea66904606c7a5d92cf46d590fa00b12a6 Renaming live.persist to live-persistence.conf. --- diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 index 85cd150..27ad650 100644 --- a/manpages/de/live-boot.de.7 +++ b/manpages/de/live-boot.de.7 @@ -95,6 +95,10 @@ Target Lun 0 Path=,Type=fileio,IOMode=ro # If you want to boot multiple machines you might want to look at tuning some parameters like # Wthreads or MaxConnections +.IP \fBfindiso\fP=\fI/PATH/TO/IMAGE\fP 4 +Look for the specified ISO file on all disks where it usually looks for the +\&.squashfs file (so you don't have to know the device name as in +fromiso=....). .IP \fBfromiso\fP=\fI/PATH/TO/IMAGE\fP 4 Allows to use a filesystem from within an iso image that's available on live\-media. @@ -177,12 +181,13 @@ live\-boot will probe devices for persistence media. These can be partitions (with the correct GPT name), filesystems (with the correct label) or image/archive files (with the correct file name). Overlays are labeled/named either "full\-ov", which will be mounted on /, or "custom\-ov", which can be -completely customized (see \fIlive.persist\fP(5)); snapshots are labeled/named -either "live\-sn" or "home\-sn" and will be extracted into / or /home, -respectively (see \fIlive\-snapshot\fP(1) for more information). The order these -are handled are: full\-ov, custom\-ov, live\-sn, home\-sn. Overlay image files -and snapshot archive files have extensions which determines their filesystem -or archive type, e.g. "custom\-ov.ext4" and "\home\-sn.squashfs". +completely customized (see \fIlive\-persistence.conf\fP(5)); snapshots are +labeled/named either "live\-sn" or "home\-sn" and will be extracted into / or +/home, respectively (see \fIlive\-snapshot\fP(1) for more information). The +order these are handled are: full\-ov, custom\-ov, live\-sn, home\-sn. Overlay +image files and snapshot archive files have extensions which determines +their filesystem or archive type, e.g. "custom\-ov.ext4" and +"\home\-sn.squashfs". .IP "\fBpersistence\-encryption\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4 This option determines which types of encryption that we allow to be used when probing devices for persistence media. If "none" is in the list, we @@ -276,12 +281,12 @@ directory with a tmpfs on the original path. .IP \fB/etc/live/boot.d/*.conf\fP 4 .IP \fBlive/boot.conf\fP 4 .IP \fBlive/boot.d/*.conf\fP 4 -.IP \fBlive.persist\fP 4 +.IP \fBlive\-persistence.conf\fP 4 .SH "SEE ALSO" \fIlive\-snapshot\fP(1) .PP -\fIlive.persist\fP(5) +\fIlive\-persistence.conf\fP(5) .PP \fIlive\-build\fP(7) .PP diff --git a/manpages/de/live.persist.5.de.persist b/manpages/de/live-persistence.conf.de.5 similarity index 78% rename from manpages/de/live.persist.5.de.persist rename to manpages/de/live-persistence.conf.de.5 index e7a09f9..73b45be 100644 --- a/manpages/de/live.persist.5.de.persist +++ b/manpages/de/live-persistence.conf.de.5 @@ -3,21 +3,22 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT persist 2012\-04\-08 3.0~a26\-1 "Debian Live Project" +.TH LIVE\-BOOT conf 2012\-04\-08 3.0~a26\-1 "Debian Live Project" .SH NAME -\fBlive.persist\fP \- Configuration file for persistence media in live\-boot +\fBlive\-persistence.conf\fP \- Configuration file for persistence media in +live\-boot .SH DESCRIPTION If live\-boot probes a persistence volume with the label (or GPT name, or file name, but from now on we will just say "label") "custom\-ov", that -volume's persistence is fully customizable through the \fBlive.persist\fP file -stored on the root of its file system. Any such labeled volume must have -such a file, or it will be ignored. +volume's persistence is fully customizable through the +\fBlive\-persistence.conf\fP file stored on the root of its file system. Any +such labeled volume must have such a file, or it will be ignored. .PP -The format of \fBlive.persist\fP allow empty lines and lines starting with a -"#" (used for comments), both which will be ignored. A so called "custom -mount" has the format: +The format of \fBlive\-persistence.conf\fP allow empty lines and lines starting +with a "#" (used for comments), both which will be ignored. A so called +"custom mount" has the format: .PP .RS \fIDIR\fP [\fIOPTION\fP]... @@ -39,14 +40,14 @@ through the use of \fIOPTION\fPs. All custom mounts will be done in an order so that no two custom mounts can "hide" each other. For instance, if we have the two \fIDIR\fP:s /a and /a/b it would always be the case that /a is mounted first, then /a/b. This remains -true no matter how the lines in \fBlive.persist\fP are ordered, or if several -\fBlive.persist\fP files on different persistence media are used at the same -time. However, it is forbidden for custom mounts to have their source -directory inside the source directory of another custom mount, so the source -directories that are auto\-created by live\-boot does not support "nested" -mounts like /a and /a/b on the same media. In this case you must use the -\fBsource\fP option (see below) to make sure that they are stored in different -source directories. +true no matter how the lines in \fBlive\-persistence.conf\fP are ordered, or if +several \fBlive\-persistence.conf\fP files on different persistence media are +used at the same time. However, it is forbidden for custom mounts to have +their source directory inside the source directory of another custom mount, +so the source directories that are auto\-created by live\-boot does not +support "nested" mounts like /a and /a/b on the same media. In this case you +must use the \fBsource\fP option (see below) to make sure that they are stored +in different source directories. .PP When a source directory doesn't exist on the persistence media for a certain custom mount, it will be created automatically, and permissions and @@ -56,8 +57,8 @@ on the persistence media. The bootstrapping will not happen when the \fBlinkfiles\fP or \fBunion\fP options are used (see below). .SH OPTIONS -Custom mounts defined in \fBlive.persist\fP accept the following options in a -coma\-separated list: +Custom mounts defined in \fBlive\-persistence.conf\fP accept the following +options in a coma\-separated list: .IP \fBsource\fP=\fIPATH\fP 4 When given, store the persistence changes into \fIPATH\fP on the persistence media. \fIPATH\fP must be a relative path (w.r.t. the persistence media root) @@ -101,14 +102,15 @@ supported with \fBunion=unionmount\fP. .SH DIRECTORIES .IP \fB/live/persistence\fP 4 All persistence volumes will be mounted here (in a directory corresponding -to the device name). The \fBlive.persist\fP file can easily be edited through -this mount, as well as any source directories (which is especially practical -for custom mounts using the \fBlinkfiles\fP option). +to the device name). The \fBlive\-persistence.conf\fP file can easily be edited +through this mount, as well as any source directories (which is especially +practical for custom mounts using the \fBlinkfiles\fP option). .SH EXAMPLES -Let's say we have a persistence volume \fIVOL\fP with the a \fBlive.persist\fP -file containing the following four lines (numbered for ease of reference): +Let's say we have a persistence volume \fIVOL\fP with the a +\fBlive\-persistence.conf\fP file containing the following four lines (numbered +for ease of reference): .TP 7 1. /home/user1 linkfiles,source=config\-files/user1 @@ -170,11 +172,11 @@ Link: /home/user2/.ssh/config \-> \fIVOL\fP/config\-files/user2/.ssh/config (from c) .PP -One could argue, though, that lines 1 and 2 in the example \fBlive.persist\fP -file above are unnecessary since line 3 already would make all of /home -persistent. The \fBlinkfiles\fP option is intended for situations where you -don't want a complete directory to be persistent, only certain files in it -or its sub\-directories. +One could argue, though, that lines 1 and 2 in the example +\fBlive\-persistence.conf\fP file above are unnecessary since line 3 already +would make all of /home persistent. The \fBlinkfiles\fP option is intended for +situations where you don't want a complete directory to be persistent, only +certain files in it or its sub\-directories. .PP Line 4 can be mounted at any time since its \fIDIR\fP (and source directory) is completely disjoint from all the other custom mounts. When mounted, diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7 index 8ac8394..3d92e62 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -107,7 +107,7 @@ This parameters allows to set a custom ramdisk size (it's the '\-o size' option .IP "\fBswapon\fR" 4 This parameter enables usage of local swap partitions. .IP "\fBpersistence\fR" 4 -live\-boot will probe devices for persistence media. These can be partitions (with the correct GPT name), filesystems (with the correct label) or image/archive files (with the correct file name). Overlays are labeled/named either "full\-ov", which will be mounted on /, or "custom\-ov", which can be completely customized (see \fIlive.persist\fR(5)); snapshots are labeled/named either "live\-sn" or "home\-sn" and will be extracted into / or /home, respectively (see \fIlive\-snapshot\fR(1) for more information). The order these are handled are: full\-ov, custom\-ov, live-sn, home-sn. Overlay image files and snapshot archive files have extensions which determines their filesystem or archive type, e.g. "custom\-ov.ext4" and "\home\-sn.squashfs". +live\-boot will probe devices for persistence media. These can be partitions (with the correct GPT name), filesystems (with the correct label) or image/archive files (with the correct file name). Overlays are labeled/named either "full\-ov", which will be mounted on /, or "custom\-ov", which can be completely customized (see \fIlive-persistence.conf\fR(5)); snapshots are labeled/named either "live\-sn" or "home\-sn" and will be extracted into / or /home, respectively (see \fIlive\-snapshot\fR(1) for more information). The order these are handled are: full\-ov, custom\-ov, live-sn, home-sn. Overlay image files and snapshot archive files have extensions which determines their filesystem or archive type, e.g. "custom\-ov.ext4" and "\home\-sn.squashfs". .IP "\fBpersistence\-encryption\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4 This option determines which types of encryption that we allow to be used when probing devices for persistence media. If "none" is in the list, we allow unencrypted media; if "luks" is in the list, we allow LUKS\-encrypted media. Whenever a device containing encrypted media is probed the user will be prompted for the passphrase. The default value is "none". .IP "\fBpersistence\-media\fR={\fIremovable\fR|\fIremovable\-usb\fR}" 4 @@ -153,12 +153,12 @@ This saves expensive writes and speeds up operations on volatile data such as we .IP "\fB/etc/live/boot.d/*.conf\fR" 4 .IP "\fBlive/boot.conf\fR" 4 .IP "\fBlive/boot.d/*.conf\fR" 4 -.IP "\fBlive.persist\fR" 4 +.IP "\fBlive-persistence.conf\fR" 4 .SH SEE ALSO \fIlive\-snapshot\fR(1) .PP -\fIlive.persist\fR(5) +\fIlive-persistence.conf\fR(5) .PP \fIlive\-build\fR(7) .PP diff --git a/manpages/en/live.persist.5 b/manpages/en/live-persistence.conf.5 similarity index 91% rename from manpages/en/live.persist.5 rename to manpages/en/live-persistence.conf.5 index 94d6e6b..b680f51 100644 --- a/manpages/en/live.persist.5 +++ b/manpages/en/live-persistence.conf.5 @@ -1,17 +1,17 @@ -.TH LIVE\-BOOT persist 2012\-04\-08 3.0~a26-1 "Debian Live Project" +.TH LIVE\-BOOT conf 2012\-04\-08 3.0~a26-1 "Debian Live Project" .SH NAME -\fBlive.persist\fR \- Configuration file for persistence media in +\fBlive-persistence.conf\fR \- Configuration file for persistence media in live\-boot .SH DESCRIPTION If live-boot probes a persistence volume with the label (or GPT name, or file name, but from now on we will just say "label") "custom\-ov", that volume's persistence is fully customizable through the -\fBlive.persist\fR file stored on the root of its file system. Any such +\fBlive-persistence.conf\fR file stored on the root of its file system. Any such labeled volume must have such a file, or it will be ignored. .PP -The format of \fBlive.persist\fR allow empty lines and lines starting +The format of \fBlive-persistence.conf\fR allow empty lines and lines starting with a "#" (used for comments), both which will be ignored. A so called "custom mount" has the format: .PP @@ -37,7 +37,7 @@ All custom mounts will be done in an order so that no two custom mounts can "hide" each other. For instance, if we have the two \fIDIR\fR:s /a and /a/b it would always be the case that /a is mounted first, then /a/b. This remains true no matter how the lines in -\fBlive.persist\fR are ordered, or if several \fBlive.persist\fR files +\fBlive-persistence.conf\fR are ordered, or if several \fBlive-persistence.conf\fR files on different persistence media are used at the same time. However, it is forbidden for custom mounts to have their source directory inside the source directory of another custom mount, so the source @@ -55,7 +55,7 @@ bootstrapping will not happen when the \fBlinkfiles\fR or \fBunion\fR options are used (see below). .SH OPTIONS -Custom mounts defined in \fBlive.persist\fR accept the following +Custom mounts defined in \fBlive-persistence.conf\fR accept the following options in a coma-separated list: .IP "\fBsource\fR=\fIPATH\fR" 4 When given, store the persistence changes into \fIPATH\fR on the @@ -102,7 +102,7 @@ live-boot's \fBunion\fR boot parameter, but is not supported with .SH DIRECTORIES .IP "\fB/live/persistence\fR" 4 All persistence volumes will be mounted here (in a directory -corresponding to the device name). The \fBlive.persist\fR file can +corresponding to the device name). The \fBlive-persistence.conf\fR file can easily be edited through this mount, as well as any source directories (which is especially practical for custom mounts using the \fBlinkfiles\fR option). @@ -110,7 +110,7 @@ easily be edited through this mount, as well as any source directories .SH EXAMPLES Let's say we have a persistence volume \fIVOL\fR with the a -\fBlive.persist\fR file containing the following four lines (numbered +\fBlive-persistence.conf\fR file containing the following four lines (numbered for ease of reference): .TP 7 1. @@ -174,7 +174,7 @@ Link: (from c) .PP One could argue, though, that lines 1 and 2 in the example -\fBlive.persist\fR file above are unnecessary since line 3 already +\fBlive-persistence.conf\fR file above are unnecessary since line 3 already would make all of /home persistent. The \fBlinkfiles\fR option is intended for situations where you don't want a complete directory to be persistent, only certain files in it or its sub-directories. diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po index 387691c..e498ea7 100644 --- a/manpages/po/de/live-boot.7.po +++ b/manpages/po/de/live-boot.7.po @@ -1,12 +1,13 @@ # German translations for live-boot package -# 2010-2012 Daniel Baumann +# Copyright (C) 2012 Free Software Foundation, Inc. # This file is distributed under the same license as the live-boot package. +# Automatically generated, 2012. # msgid "" msgstr "" -"Project-Id-Version: live-boot 3.0~a26\n" -"POT-Creation-Date: 2012-04-08 18:23+0300\n" -"PO-Revision-Date: 2012-04-05 08:11+0300\n" +"Project-Id-Version: live-boot VERSION\n" +"POT-Creation-Date: 2012-04-08 22:48+0300\n" +"PO-Revision-Date: 2012-04-08 22:48+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: de\n" @@ -16,31 +17,31 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. type: TH -#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1 +#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1 #, no-wrap msgid "LIVE-BOOT" msgstr "" #. type: TH -#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1 +#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1 #, no-wrap msgid "2012-04-08" msgstr "" #. type: TH -#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1 +#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1 #, no-wrap msgid "3.0~a26-1" msgstr "" #. type: TH -#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1 +#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1 #, no-wrap msgid "Debian Live Project" msgstr "" #. type: SH -#: en/live-boot.7:3 en/live-snapshot.1:3 en/live.persist.5:3 +#: en/live-boot.7:3 en/live-persistence.conf.5:3 en/live-snapshot.1:3 #, no-wrap msgid "NAME" msgstr "" @@ -51,7 +52,7 @@ msgid "B - System Boot Scripts" msgstr "" #. type: SH -#: en/live-boot.7:6 en/live-snapshot.1:17 en/live.persist.5:7 +#: en/live-boot.7:6 en/live-persistence.conf.5:7 en/live-snapshot.1:17 #, no-wrap msgid "DESCRIPTION" msgstr "" @@ -137,7 +138,7 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:28 en/live-snapshot.1:20 en/live.persist.5:57 +#: en/live-boot.7:28 en/live-persistence.conf.5:57 en/live-snapshot.1:20 #, no-wrap msgid "OPTIONS" msgstr "" @@ -284,24 +285,37 @@ msgstr "" #. type: IP #: en/live-boot.7:69 #, no-wrap -msgid "B=I" +msgid "B=I" msgstr "" #. type: Plain text #: en/live-boot.7:71 msgid "" +"Look for the specified ISO file on all disks where it usually looks for the ." +"squashfs file (so you don't have to know the device name as in fromiso=....)." +msgstr "" + +#. type: IP +#: en/live-boot.7:71 +#, no-wrap +msgid "B=I" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:73 +msgid "" "Allows to use a filesystem from within an iso image that's available on live-" "media." msgstr "" #. type: IP -#: en/live-boot.7:71 +#: en/live-boot.7:73 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:73 +#: en/live-boot.7:75 msgid "" "Do not check that any UUID embedded in the initramfs matches the discovered " "medium. live-boot may be told to generate a UUID by setting " @@ -309,13 +323,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:73 +#: en/live-boot.7:75 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:75 +#: en/live-boot.7:77 msgid "" "If specified, an MD5 sum is calculated on the live media during boot and " "compared to the value found in md5sum.txt found in the root directory of the " @@ -323,13 +337,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:75 +#: en/live-boot.7:77 #, no-wrap msgid "B=[I]:[I]:[I]:[I]:[I]:[I]:[I] [,[I]:[I]:[I]:[I]:[I]:[I]:[I]]" msgstr "" #. type: Plain text -#: en/live-boot.7:77 +#: en/live-boot.7:79 msgid "" "Let you specify the name(s) and the options of the interface(s) that should " "be configured at boot time. Do not specify this if you want to use dhcp " @@ -339,13 +353,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:77 +#: en/live-boot.7:79 #, no-wrap msgid "B=[I]" msgstr "" #. type: Plain text -#: en/live-boot.7:79 +#: en/live-boot.7:81 msgid "" "If this variable is set, dhcp and static configuration are just skipped and " "the system will use the (must be) media-preconfigured /etc/network/" @@ -353,13 +367,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:79 +#: en/live-boot.7:81 #, no-wrap msgid "{B|B}=I" msgstr "" #. type: Plain text -#: en/live-boot.7:81 +#: en/live-boot.7:83 msgid "" "If you specify one of this two equivalent forms, live-boot will first try to " "find this device for the \"/live\" directory where the read-only root " @@ -368,7 +382,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-boot.7:83 +#: en/live-boot.7:85 msgid "" "Instead of specifing an actual device name, the keyword 'removable' can be " "used to limit the search of acceptable live media to removable type only. " @@ -377,13 +391,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:83 +#: en/live-boot.7:85 #, no-wrap msgid "{B|B}=I" msgstr "" #. type: Plain text -#: en/live-boot.7:85 +#: en/live-boot.7:87 msgid "" "live-boot will mount the encrypted rootfs TYPE, asking the passphrase, " "useful to build paranoid live systems :-). TYPE supported so far are \"aes\" " @@ -391,13 +405,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:85 +#: en/live-boot.7:87 #, no-wrap msgid "B=I" msgstr "" #. type: Plain text -#: en/live-boot.7:87 +#: en/live-boot.7:89 msgid "" "This way you could tell live-boot that your image starts at offset BYTES in " "the above specified or autodiscovered device, this could be useful to hide " @@ -406,13 +420,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:87 +#: en/live-boot.7:89 #, no-wrap msgid "B=I" msgstr "" #. type: Plain text -#: en/live-boot.7:89 +#: en/live-boot.7:91 msgid "" "Sets the path to the live filesystem on the medium. By default, it is set to " "'/live' and you should not change that unless you have customized your media " @@ -420,26 +434,26 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:89 +#: en/live-boot.7:91 #, no-wrap msgid "B=I" msgstr "" #. type: Plain text -#: en/live-boot.7:91 +#: en/live-boot.7:93 msgid "" "Set the timeout in seconds for the device specified by \"live-media=\" to " "become ready before giving up." msgstr "" #. type: IP -#: en/live-boot.7:91 +#: en/live-boot.7:93 #, no-wrap msgid "B=I" msgstr "" #. type: Plain text -#: en/live-boot.7:93 +#: en/live-boot.7:95 msgid "" "Instead of using the default optional file \"filesystem.module\" (see below) " "another file could be specified without the extension \".module\"; it should " @@ -447,13 +461,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:93 +#: en/live-boot.7:95 #, no-wrap msgid "B[=nfs|cifs]" msgstr "" #. type: Plain text -#: en/live-boot.7:95 +#: en/live-boot.7:97 msgid "" "This tells live-boot to perform a network mount. The parameter \"nfsroot=" "\" (with optional \"nfsopts=\"), should specify where is the location of the " @@ -461,24 +475,24 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:95 +#: en/live-boot.7:97 #, no-wrap msgid "B=" msgstr "" #. type: Plain text -#: en/live-boot.7:97 +#: en/live-boot.7:99 msgid "This lets you specify custom nfs options." msgstr "" #. type: IP -#: en/live-boot.7:97 +#: en/live-boot.7:99 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:99 +#: en/live-boot.7:101 msgid "" "This parameter disables the default disabling of filesystem checks in /etc/" "fstab. If you have static filesystems on your harddisk and you want them to " @@ -486,50 +500,50 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:99 +#: en/live-boot.7:101 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:101 +#: en/live-boot.7:103 msgid "" "disables the \"persistence\" feature, useful if the bootloader (like " "syslinux) has been installed with persistence enabled." msgstr "" #. type: IP -#: en/live-boot.7:101 +#: en/live-boot.7:103 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:103 +#: en/live-boot.7:105 msgid "Do not prompt to eject the CD or remove the USB flash drive on reboot." msgstr "" #. type: IP -#: en/live-boot.7:103 +#: en/live-boot.7:105 #, no-wrap msgid "B=I" msgstr "" #. type: Plain text -#: en/live-boot.7:105 +#: en/live-boot.7:107 msgid "" "This tells live-boot not to prompt to eject the CD (when noprompt=cd) or " "remove the USB flash drive (when noprompt=usb) on reboot." msgstr "" #. type: IP -#: en/live-boot.7:105 +#: en/live-boot.7:107 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:107 +#: en/live-boot.7:109 msgid "" "This parameters allows to set a custom ramdisk size (it's the '-o size' " "option of tmpfs mount). By default, there is no ramdisk size set, so the " @@ -538,46 +552,46 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:107 +#: en/live-boot.7:109 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:109 +#: en/live-boot.7:111 msgid "This parameter enables usage of local swap partitions." msgstr "" #. type: IP -#: en/live-boot.7:109 +#: en/live-boot.7:111 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:111 +#: en/live-boot.7:113 msgid "" "live-boot will probe devices for persistence media. These can be partitions " "(with the correct GPT name), filesystems (with the correct label) or image/" "archive files (with the correct file name). Overlays are labeled/named " "either \"full-ov\", which will be mounted on /, or \"custom-ov\", which can " -"be completely customized (see I(5)); snapshots are labeled/" -"named either \"live-sn\" or \"home-sn\" and will be extracted into / or /" -"home, respectively (see I(1) for more information). The order " -"these are handled are: full-ov, custom-ov, live-sn, home-sn. Overlay image " -"files and snapshot archive files have extensions which determines their " -"filesystem or archive type, e.g. \"custom-ov.ext4\" and \"\\home-sn.squashfs" -"\"." +"be completely customized (see I(5)); snapshots are " +"labeled/named either \"live-sn\" or \"home-sn\" and will be extracted into / " +"or /home, respectively (see I(1) for more information). The " +"order these are handled are: full-ov, custom-ov, live-sn, home-sn. Overlay " +"image files and snapshot archive files have extensions which determines " +"their filesystem or archive type, e.g. \"custom-ov.ext4\" and \"\\home-sn." +"squashfs\"." msgstr "" #. type: IP -#: en/live-boot.7:111 +#: en/live-boot.7:113 #, no-wrap msgid "B=I,I ... I" msgstr "" #. type: Plain text -#: en/live-boot.7:113 +#: en/live-boot.7:115 msgid "" "This option determines which types of encryption that we allow to be used " "when probing devices for persistence media. If \"none\" is in the list, we " @@ -587,13 +601,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:113 +#: en/live-boot.7:115 #, no-wrap msgid "B={I|I}" msgstr "" #. type: Plain text -#: en/live-boot.7:115 +#: en/live-boot.7:117 msgid "" "If you specify the keyword 'removable', live-boot will try to find " "persistence and snapshot partitions on removable media only. Note that if " @@ -602,13 +616,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:115 +#: en/live-boot.7:117 #, no-wrap msgid "B=I,I ... I" msgstr "" #. type: Plain text -#: en/live-boot.7:117 +#: en/live-boot.7:119 msgid "" "This option determines which types of persistence media we allow. If " "\"overlay\" is in the list, we consider overlays (i.e. \"live-rw\" and " @@ -617,13 +631,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:117 +#: en/live-boot.7:119 #, no-wrap msgid "B=I" msgstr "" #. type: Plain text -#: en/live-boot.7:119 +#: en/live-boot.7:121 msgid "" "live-boot will look for persistency files in the root directory of a " "partition, with this parameter, the path can be configured so that you can " @@ -631,13 +645,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:119 +#: en/live-boot.7:121 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:121 +#: en/live-boot.7:123 msgid "" "Filesystem changes are not saved back to persistence media. In particular, " "overlays and netboot NFS mounts are mounted read-only, and snapshots are not " @@ -645,13 +659,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:121 +#: en/live-boot.7:123 #, no-wrap msgid "B=I,I ... I" msgstr "" #. type: Plain text -#: en/live-boot.7:123 +#: en/live-boot.7:125 msgid "" "This option determines which types of persistence storage to consider when " "probing for persistence media. If \"filesystem\" is in the list, filesystems " @@ -661,13 +675,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:123 +#: en/live-boot.7:125 #, no-wrap msgid "B=I" msgstr "" #. type: Plain text -#: en/live-boot.7:125 +#: en/live-boot.7:127 msgid "" "Add a suffix when searching for the image filenames or partition labels to " "use for the above mentioned persistence feature, the SUFFIX will be added " @@ -677,26 +691,26 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:125 +#: en/live-boot.7:127 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:127 +#: en/live-boot.7:129 msgid "" "This option causes live-boot to reboot without attempting to eject the media " "and without asking the user to remove the boot media." msgstr "" #. type: IP -#: en/live-boot.7:127 +#: en/live-boot.7:129 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:129 +#: en/live-boot.7:131 msgid "" "This parameter will make live-boot to show on \"/\" the ro filesystems " "(mostly compressed) on \"/live\". This is not enabled by default because " @@ -705,26 +719,26 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:129 +#: en/live-boot.7:131 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:131 +#: en/live-boot.7:133 msgid "" "If you boot with the normal quiet parameter, live-boot hides most messages " "of its own. When adding silent, it hides all." msgstr "" #. type: IP -#: en/live-boot.7:131 +#: en/live-boot.7:133 #, no-wrap msgid "B=I" msgstr "" #. type: Plain text -#: en/live-boot.7:133 +#: en/live-boot.7:135 msgid "" "Adding this parameter, live-boot will try to copy the entire read-only media " "to the specified device before mounting the root filesystem. It probably " @@ -734,13 +748,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:133 +#: en/live-boot.7:135 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:135 +#: en/live-boot.7:137 msgid "" "Adding this parameter, live-boot will try to copy the whole read-only media " "to the computer's RAM before mounting the root filesystem. This could need a " @@ -748,14 +762,14 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:135 +#: en/live-boot.7:137 #, no-wrap msgid "B=aufs|unionfs" msgstr "" #. FIXME #. type: Plain text -#: en/live-boot.7:138 +#: en/live-boot.7:140 msgid "" "By default, live-boot uses aufs. With this parameter, you can switch to " "unionfs." @@ -763,32 +777,32 @@ msgstr "" #. FIXME #. type: SH -#: en/live-boot.7:140 +#: en/live-boot.7:142 #, no-wrap msgid "FILES (old)" msgstr "" #. type: IP -#: en/live-boot.7:141 en/live-snapshot.1:43 +#: en/live-boot.7:143 en/live-snapshot.1:43 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:143 en/live-snapshot.1:45 +#: en/live-boot.7:145 en/live-snapshot.1:45 msgid "" "Some variables can be configured via this config file (inside the live " "system)." msgstr "" #. type: IP -#: en/live-boot.7:143 en/live-snapshot.1:45 +#: en/live-boot.7:145 en/live-snapshot.1:45 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:145 en/live-snapshot.1:47 +#: en/live-boot.7:147 en/live-snapshot.1:47 msgid "" "This optional file (inside the live media) contains a list of white-space or " "carriage-return-separated file names corresponding to disk images in the \"/" @@ -801,13 +815,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:145 en/live-snapshot.1:47 +#: en/live-boot.7:147 en/live-snapshot.1:47 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:147 en/live-snapshot.1:49 +#: en/live-boot.7:149 en/live-snapshot.1:49 msgid "" "This optional file (which resides in the rootfs system, not in the live " "media) is used as a list of directories which not need be persistent: ie. " @@ -816,7 +830,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-boot.7:150 en/live-snapshot.1:51 +#: en/live-boot.7:152 en/live-snapshot.1:51 msgid "" "This saves expensive writes and speeds up operations on volatile data such " "as web caches and temporary files (like e.g. /tmp and .mozilla) which are " @@ -825,80 +839,80 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:151 en/live-snapshot.1:42 +#: en/live-boot.7:153 en/live-snapshot.1:42 #, no-wrap msgid "FILES" msgstr "" #. type: IP -#: en/live-boot.7:152 +#: en/live-boot.7:154 #, no-wrap msgid "B" msgstr "" #. type: IP -#: en/live-boot.7:153 +#: en/live-boot.7:155 #, no-wrap msgid "B" msgstr "" #. type: IP -#: en/live-boot.7:154 +#: en/live-boot.7:156 #, no-wrap msgid "B" msgstr "" #. type: IP -#: en/live-boot.7:155 +#: en/live-boot.7:157 #, no-wrap msgid "B" msgstr "" #. type: IP -#: en/live-boot.7:156 +#: en/live-boot.7:158 #, no-wrap -msgid "B" +msgid "B" msgstr "" #. type: SH -#: en/live-boot.7:158 en/live-snapshot.1:54 en/live.persist.5:191 +#: en/live-boot.7:160 en/live-persistence.conf.5:191 en/live-snapshot.1:54 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: en/live-boot.7:160 +#: en/live-boot.7:162 msgid "I(1)" msgstr "" #. type: Plain text -#: en/live-boot.7:162 -msgid "I(5)" +#: en/live-boot.7:164 +msgid "I(5)" msgstr "" #. type: Plain text -#: en/live-boot.7:164 en/live-snapshot.1:58 en/live.persist.5:195 +#: en/live-boot.7:166 en/live-persistence.conf.5:195 en/live-snapshot.1:58 msgid "I(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:166 en/live-snapshot.1:60 en/live.persist.5:197 +#: en/live-boot.7:168 en/live-persistence.conf.5:197 en/live-snapshot.1:60 msgid "I(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:168 en/live-snapshot.1:62 en/live.persist.5:199 +#: en/live-boot.7:170 en/live-persistence.conf.5:199 en/live-snapshot.1:62 msgid "I(7)" msgstr "" #. type: SH -#: en/live-boot.7:169 en/live-snapshot.1:63 en/live.persist.5:200 +#: en/live-boot.7:171 en/live-persistence.conf.5:200 en/live-snapshot.1:63 #, no-wrap msgid "HOMEPAGE" msgstr "" #. type: Plain text -#: en/live-boot.7:171 en/live-snapshot.1:65 en/live.persist.5:204 +#: en/live-boot.7:173 en/live-persistence.conf.5:204 en/live-snapshot.1:65 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at EIE and in the manual at " @@ -906,13 +920,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:172 en/live-snapshot.1:66 en/live.persist.5:205 +#: en/live-boot.7:174 en/live-persistence.conf.5:205 en/live-snapshot.1:66 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: en/live-boot.7:174 en/live-snapshot.1:68 en/live.persist.5:210 +#: en/live-boot.7:176 en/live-persistence.conf.5:210 en/live-snapshot.1:68 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Debian Bug Tracking System at EIE or by " @@ -921,13 +935,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:175 en/live-snapshot.1:69 en/live.persist.5:211 +#: en/live-boot.7:177 en/live-persistence.conf.5:211 en/live-snapshot.1:69 #, no-wrap msgid "AUTHOR" msgstr "" #. type: Plain text -#: en/live-boot.7:176 en/live-snapshot.1:70 +#: en/live-boot.7:178 en/live-snapshot.1:70 msgid "" "live-boot was written by Daniel Baumann EIE for " "the Debian project." diff --git a/manpages/po/de/live.persist.5.po b/manpages/po/de/live-persistence.conf.5.po similarity index 65% rename from manpages/po/de/live.persist.5.po rename to manpages/po/de/live-persistence.conf.5.po index 7ffa3d2..dbcb269 100644 --- a/manpages/po/de/live.persist.5.po +++ b/manpages/po/de/live-persistence.conf.5.po @@ -1,12 +1,13 @@ # German translations for live-boot package -# 2010-2012 Daniel Baumann +# Copyright (C) 2012 Free Software Foundation, Inc. # This file is distributed under the same license as the live-boot package. +# Automatically generated, 2012. # msgid "" msgstr "" -"Project-Id-Version: live-boot 3.0~a26-1\n" -"POT-Creation-Date: 2012-04-08 18:23+0300\n" -"PO-Revision-Date: 2012-04-05 08:11+0300\n" +"Project-Id-Version: live-boot VERSION\n" +"POT-Creation-Date: 2012-04-08 22:48+0300\n" +"PO-Revision-Date: 2012-04-08 22:48+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: de\n" @@ -16,76 +17,76 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. type: TH -#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1 +#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1 #, no-wrap msgid "LIVE-BOOT" msgstr "" #. type: TH -#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1 +#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1 #, no-wrap msgid "2012-04-08" msgstr "" #. type: TH -#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1 +#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1 #, no-wrap msgid "3.0~a26-1" msgstr "" #. type: TH -#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1 +#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1 #, no-wrap msgid "Debian Live Project" msgstr "" #. type: SH -#: en/live-boot.7:3 en/live-snapshot.1:3 en/live.persist.5:3 +#: en/live-boot.7:3 en/live-persistence.conf.5:3 en/live-snapshot.1:3 #, no-wrap msgid "NAME" msgstr "" #. type: SH -#: en/live-boot.7:6 en/live-snapshot.1:17 en/live.persist.5:7 +#: en/live-boot.7:6 en/live-persistence.conf.5:7 en/live-snapshot.1:17 #, no-wrap msgid "DESCRIPTION" msgstr "" #. type: SH -#: en/live-boot.7:28 en/live-snapshot.1:20 en/live.persist.5:57 +#: en/live-boot.7:28 en/live-persistence.conf.5:57 en/live-snapshot.1:20 #, no-wrap msgid "OPTIONS" msgstr "" #. type: SH -#: en/live-boot.7:158 en/live-snapshot.1:54 en/live.persist.5:191 +#: en/live-boot.7:160 en/live-persistence.conf.5:191 en/live-snapshot.1:54 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: en/live-boot.7:164 en/live-snapshot.1:58 en/live.persist.5:195 +#: en/live-boot.7:166 en/live-persistence.conf.5:195 en/live-snapshot.1:58 msgid "I(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:166 en/live-snapshot.1:60 en/live.persist.5:197 +#: en/live-boot.7:168 en/live-persistence.conf.5:197 en/live-snapshot.1:60 msgid "I(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:168 en/live-snapshot.1:62 en/live.persist.5:199 +#: en/live-boot.7:170 en/live-persistence.conf.5:199 en/live-snapshot.1:62 msgid "I(7)" msgstr "" #. type: SH -#: en/live-boot.7:169 en/live-snapshot.1:63 en/live.persist.5:200 +#: en/live-boot.7:171 en/live-persistence.conf.5:200 en/live-snapshot.1:63 #, no-wrap msgid "HOMEPAGE" msgstr "" #. type: Plain text -#: en/live-boot.7:171 en/live-snapshot.1:65 en/live.persist.5:204 +#: en/live-boot.7:173 en/live-persistence.conf.5:204 en/live-snapshot.1:65 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at EIE and in the manual at " @@ -93,13 +94,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:172 en/live-snapshot.1:66 en/live.persist.5:205 +#: en/live-boot.7:174 en/live-persistence.conf.5:205 en/live-snapshot.1:66 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: en/live-boot.7:174 en/live-snapshot.1:68 en/live.persist.5:210 +#: en/live-boot.7:176 en/live-persistence.conf.5:210 en/live-snapshot.1:68 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Debian Bug Tracking System at EIE or by " @@ -108,48 +109,50 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:175 en/live-snapshot.1:69 en/live.persist.5:211 +#: en/live-boot.7:177 en/live-persistence.conf.5:211 en/live-snapshot.1:69 #, no-wrap msgid "AUTHOR" msgstr "" #. type: Plain text -#: en/live.persist.5:6 -msgid "B - Configuration file for persistence media in live-boot" +#: en/live-persistence.conf.5:6 +msgid "" +"B - Configuration file for persistence media in live-" +"boot" msgstr "" #. type: Plain text -#: en/live.persist.5:13 +#: en/live-persistence.conf.5:13 msgid "" "If live-boot probes a persistence volume with the label (or GPT name, or " "file name, but from now on we will just say \"label\") \"custom-ov\", that " -"volume's persistence is fully customizable through the B file " -"stored on the root of its file system. Any such labeled volume must have " -"such a file, or it will be ignored." +"volume's persistence is fully customizable through the B file stored on the root of its file system. Any such labeled volume " +"must have such a file, or it will be ignored." msgstr "" #. type: Plain text -#: en/live.persist.5:17 +#: en/live-persistence.conf.5:17 msgid "" -"The format of B allow empty lines and lines starting with a \"#" -"\" (used for comments), both which will be ignored. A so called \"custom " -"mount\" has the format:" +"The format of B allow empty lines and lines starting " +"with a \"#\" (used for comments), both which will be ignored. A so called " +"\"custom mount\" has the format:" msgstr "" #. type: Plain text -#: en/live.persist.5:20 +#: en/live-persistence.conf.5:20 msgid "I [I