[SCM] live-boot branch, debian-next, updated. debian/3.0_a25-1-70-ga39a167
Daniel Baumann
daniel at debian.org
Thu Apr 5 06:00:35 UTC 2012
The following commit has been merged in the debian-next branch:
commit a39a1678776b1bfe92e717f5abd5f55b6404b525
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Apr 5 07:59:29 2012 +0200
Correcting left-over in author section of live.persist manpage.
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 21f6680..1e5a2df 100644
--- a/manpages/de/live-boot.de.7
+++ b/manpages/de/live-boot.de.7
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 7 2012\-02\-06 3.0~a25\-1 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 05.04.2012 3.0~a25\-1 "Debian Live Projekt"
.SH NAME
\fBlive\-boot\fP \- System Boot Skripte
@@ -173,16 +173,16 @@ option has no currently no effect when booting with toram.
.IP \fBswapon\fP 4
This parameter enables usage of local swap partitions.
.IP \fBpersistent\fP 4
-live\-boot will probe filesystems for persistent media. These can either be
-the filesystems themselves, if labeled correctly, or image/archive files, if
-named correctly. Overlays are labeled/named either "live\-rw" or "home\-rw"
-and will be mounted on / or /home, respectively; snapshots are labeled/named
+live\-boot will probe devices for persistent 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 live\-snapshot(1) for more information). Overlays are
-mounted before snapshots are extracted, and for both overlays and snapshots,
-"live\-*" are handled before "home\-*". Overlay image files and snapshot
-archive files have extensions which determines their filesystem or archive
-type, e.g. "live\-rw.ext3" and "\home\-sn.squashfs".
+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.ext3" and "\home\-sn.squashfs".
.IP "\fBpersistent\-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 persistent media. If "none" is in the list, we
@@ -283,10 +283,13 @@ directory with a tmpfs on the original path.
.IP \fB/etc/live/boot.d/\fP 4
.IP \fBlive/boot.conf\fP 4
.IP \fBlive/boot.d/\fP 4
+.IP \fBlive.persistent\fP 4
.SH "SIEHE AUCH"
\fIlive\-snapshot\fP(1)
.PP
+\fIlive.persist\fP(1)
+.PP
\fIlive\-build\fP(7)
.PP
\fIlive\-config\fP(7)
diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index cdaad14..2f16ab5 100644
--- a/manpages/de/live-snapshot.de.1
+++ b/manpages/de/live-snapshot.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 1 2012\-02\-06 3.0~a25\-1 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 05.04.2012 3.0~a25\-1 "Debian Live Projekt"
.SH NAME
\fBlive\-snapshot\fP \- simple script to ease persistence usage
diff --git a/manpages/de/live.persist.5.de.persist b/manpages/de/live.persist.5.de.persist
new file mode 100644
index 0000000..6cd8978
--- /dev/null
+++ b/manpages/de/live.persist.5.de.persist
@@ -0,0 +1,210 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH LIVE\-BOOT persist 05.04.2012 3.0~a25\-1 "Debian Live Projekt"
+
+.SH NAME
+\fBlive.persist\fP \- Configuration file for persistent media in live\-boot
+
+.SH BESCHREIBUNG
+If live\-boot probes a persistent 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.
+.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:
+.PP
+.RS
+\fIDIR\fP [\fIOPTION\fP]...
+.RE
+.PP
+which roughly translates to "make \fIDIR\fP persistent in the way described by
+the list of \fIOPTION\fPs".
+.PP
+For each custom mount \fIDIR\fP must be an absolute path that cannot contain
+white spaces or the special . and .. path components, and cannot be /live
+(or any of its sub\-directories), or / (for the latter, use "full\-ov"
+persistence instead). Once activated all changes (file deletion, creation
+and modification) to \fIDIR\fP on the live file system are stored persistently
+into a path equivalent to \fIDIR\fP on the persistent media, called the source
+directory. The default way to achieve persistence is to simply bind\-mount
+the corresponding source directory to \fIDIR\fP, but this can be changed
+through the use of \fIOPTION\fPs.
+.PP
+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 persistent 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 persistent media for a certain
+custom mount, it will be created automatically, and permissions and
+ownership will be optimistically set according to \fIDIR\fP. It will also be
+bootstrapped by copying the contents of the \fIDIR\fP into its source directory
+on the persistent media. The bootstrapping will not happen when the
+\fBlinkfiles\fP or \fBunion\fP options are used (see below).
+
+.SH OPTIONEN
+Custom mounts defined in \fBlive.persist\fP accept the following options in a
+coma\-separated list:
+.IP \fBsource\fP=\fIPATH\fP 4
+When given, store the persistent changes into \fIPATH\fP on the persistent
+media. \fIPATH\fP must be a relative path (w.r.t. the persistent media root)
+that cannot contain white spaces or the special . or .. path components,
+with the exception that it can be just . which means the persistent media
+root. This option is mostly relevant if you want to nest custom mounts,
+which otherwise would cause errors, or if you want to make the whole media
+root available (similar to the now deprecated \fBhome\-rw\fP type of
+persistence).
+.PP
+The following options are mutually exclusive (only the last given one will
+be in effect):
+.IP \fBbind\fP 4
+Bind\-mount the source directory to \fIDIR\fP. This is the default.
+.IP \fBlinkfiles\fP 4
+Create the directory structure of the source directory on the persistent
+media in \fIDIR\fP and create symbolic links from the corresponding place in
+\fIDIR\fP to each file in the source directory. Existing files or directories
+with the same name as any link will be overwritten. Note that deleting the
+links in \fIDIR\fP will only remove the link, not the corresponding file in the
+source; removed links will reappear after a reboot. To permanently add or
+delete a file one must do so directly in the source directory.
+.IP
+Effectively \fBlinkfiles\fP will make only files already in the source
+directory persistent, not any other files in \fIDIR\fP. These files must be
+manually added to the source directory to make use of this option, and they
+will appear in \fIDIR\fP in addition to files already there. This option is
+useful when only certain files need to be persistent, not the whole
+directory they're in, e.g. some configuration files in a user's home
+directory.
+.IP \fBunion\fP 4
+Save the rw branch of a union on the persistent media, so only the changes
+are stored persistently. This can potentially reduce disk usage compared to
+bind\-mounts, and will not hide files added to the read\-only media. One
+caveat is that the union will use \fIDIR\fP from the image's read\-only file
+system, not the real file system root, so files created after boot (e.g. by
+live\-config) will not appear in the union. This option will use the union
+file system specified by live\-boot's \fBunion\fP boot parameter, but is not
+supported with \fBunion=unionmount\fP.
+
+.SH DIRECTORIES
+.IP \fB/live/persistent\fP 4
+All persistent 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).
+
+.SH EXAMPLES
+
+Let's say we have a persistent volume \fIVOL\fP with the a \fBlive.persist\fP file
+containing the following four lines (numbered for ease of reference):
+.TP 7
+1.
+/home/user1 linkfiles,source=config\-files/user1
+.TP
+2.
+/home/user2 linkfiles,source=config\-files/user2
+.TP
+3.
+/home
+.TP
+4.
+/usr union
+.PP
+The corresponding source directories are:
+.TP 7
+1.
+\fIVOL\fP/config\-files/user1 (but it would be \fIVOL\fP/home/user1 without the
+\fBsource\fP option)
+.TP
+2.
+\fIVOL\fP/config\-files/user2 (but it would be \fIVOL\fP/home/user2 without the
+\fBsource\fP option)
+.TP
+3.
+\fIVOL\fP/home
+.TP
+4.
+\fIVOL\fP/usr
+.PP
+It was necessary to set the \fBsource\fP options for 1 and 2, since they
+otherwise would become nested with 3's source, which is illegal.
+.PP
+Line 3 will be taken care of before line 1 and 2 in order to prevent custom
+mounts 1 and 2 from being hidden by 3. When line 3 is handled, \fIVOL\fP/home
+is simply bind\-mounted on /home. To illustrate what happens for lines 1 and
+2, let's say that the following files exist:
+.TP 7
+a.
+\fIVOL\fP/config\-files/user1/.emacs
+.TP
+b.
+\fIVOL\fP/config\-files/user2/.bashrc
+.TP
+c.
+\fIVOL\fP/config\-files/user2/.ssh/config
+.PP
+Then the following links and directories will be created:
+.TP 7
+Link:
+/home/user1/.emacs \-> \fIVOL\fP/config\-files/user1/.emacs (from a)
+.TP
+Link:
+/home/user2/.bashrc \-> \fIVOL\fP/config\-files/user2/.bashrc (from b)
+.TP
+Dir:
+/homea/user2/.ssh (from c)
+.TP
+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.
+.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,
+\fIVOL\fP/usr will be the rw branch due to the \fBunion\fP option, and will only
+contain the difference compared to the underlying read\-only file
+system. Hence packages could be installed into /usr with great space\-wise
+efficiency compared to bind\-mounts, since in the latter case all of /usr
+would have to be copied into \fIVOL\fP/usr during the initial bootstrap.
+
+.SH "SIEHE AUCH"
+\fIlive\-boot\fP(7)
+.PP
+\fIlive\-build\fP(7)
+.PP
+\fIlive\-config\fP(7)
+.PP
+\fIlive\-tools\fP(7)
+
+.SH HOMEPAGE
+Weitere Informationen ueber live\-boot und das Debian Live Projekt koennen
+auf der Homepage unter <\fIhttp://live.debian.net/\fP> und im Handbuch
+unter <\fIhttp://live.debian.net/manual/\fP> gefunden werden.
+
+.SH FEHLER
+Fehler koennen durch Einreichen eines Fehlerberichtes fuer das live\-boot
+Paket im Debian Bug Tracking System unter
+<\fIhttp://bugs.debian.org/\fP> oder durch Senden einer E\-Mail an die
+Debian Live Mailing Liste unter <\fIdebian\-live at lists.debian.org\fP>
+(englischsprachig) mitgeteilt werden.
+
+.SH AUTOR
+live.persist was written by anonym <\fIanonym at lavabit.com\fP> for the
+Debian project.
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 65c9c31..98efaa1 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2012\-03\-23 3.0~a25-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-04\-05 3.0~a25-1 "Debian Live Project"
.SH NAME
\fBlive\-boot\fR \- System Boot Scripts
diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1
index a7daa55..f8a7584 100644
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2012\-02\-06 3.0~a25-1 "Debian Live Project"
+.TH LIVE\-BOOT 1 2012\-04\-05 3.0~a25-1 "Debian Live Project"
.SH NAME
\fBlive\-snapshot\fR \- simple script to ease persistence usage
diff --git a/manpages/en/live.persist.5 b/manpages/en/live.persist.5
index 68c2c81..815bd43 100644
--- a/manpages/en/live.persist.5
+++ b/manpages/en/live.persist.5
@@ -1,4 +1,4 @@
-.TH LIVE.PERSIST 5 2012\-03\-23 3.0~a25-1 "Debian Live Project"
+.TH LIVE\-BOOT persist 2012\-04\-05 3.0~a25-1 "Debian Live Project"
.SH NAME
\fBlive.persist\fR \- Configuration file for persistent media in
@@ -209,5 +209,5 @@ package in the Debian Bug Tracking System at
Live mailing list at <\fIdebian-live at lists.debian.org\fR>.
.SH AUTHOR
-live\-boot was written by anonym <\fIanonym at lavabit.com\fR> for the
+live\.persist was written by anonym <\fIanonym at lavabit.com\fR> for the
Debian project.
diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index c1e8a99..09d6de5 100644
--- a/manpages/po/de/live-boot.7.po
+++ b/manpages/po/de/live-boot.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot 3.0~a22-1\n"
-"POT-Creation-Date: 2012-02-06 23:27+0100\n"
+"POT-Creation-Date: 2012-04-05 07:55+0300\n"
"PO-Revision-Date: 2010-05-24 12:34+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -16,33 +16,31 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1
+#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
#, no-wrap
msgid "LIVE-BOOT"
msgstr "LIVE-BOOT"
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1
-#, fuzzy, no-wrap
-#| msgid "2011-12-04"
-msgid "2012-02-06"
-msgstr "04.12.2011"
+#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#, no-wrap
+msgid "2012-04-05"
+msgstr "05.04.2012"
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1
-#, fuzzy, no-wrap
-#| msgid "3.0~a24-1"
+#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#, no-wrap
msgid "3.0~a25-1"
-msgstr "3.0~a24-1"
+msgstr "3.0~a25-1"
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1
+#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
#, no-wrap
msgid "Debian Live Project"
msgstr "Debian Live Projekt"
#. type: SH
-#: en/live-boot.7:3 en/live-snapshot.1:3
+#: en/live-boot.7:3 en/live-snapshot.1:3 en/live.persist.5:3
#, no-wrap
msgid "NAME"
msgstr "NAME"
@@ -53,7 +51,7 @@ msgid "B<live-boot> - System Boot Scripts"
msgstr "B<live-boot> - System Boot Skripte"
#. type: SH
-#: en/live-boot.7:6 en/live-snapshot.1:17
+#: en/live-boot.7:6 en/live-snapshot.1:17 en/live.persist.5:7
#, no-wrap
msgid "DESCRIPTION"
msgstr "BESCHREIBUNG"
@@ -145,7 +143,7 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:28 en/live-snapshot.1:20
+#: en/live-boot.7:28 en/live-snapshot.1:20 en/live.persist.5:57
#, no-wrap
msgid "OPTIONS"
msgstr "OPTIONEN"
@@ -565,16 +563,17 @@ msgstr "B<persistent>"
#. type: Plain text
#: en/live-boot.7:111
msgid ""
-"live-boot will probe filesystems for persistent media. These can either be "
-"the filesystems themselves, if labeled correctly, or image/archive files, if "
-"named correctly. Overlays are labeled/named either \"live-rw\" or \"home-rw"
-"\" and will be mounted on / or /home, respectively; snapshots are labeled/"
+"live-boot will probe devices for persistent 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<live.persist>(5)); snapshots are labeled/"
"named either \"live-sn\" or \"home-sn\" and will be extracted into / or /"
-"home, respectively (see live-snapshot(1) for more information). Overlays are "
-"mounted before snapshots are extracted, and for both overlays and snapshots, "
-"\"live-*\" are handled before \"home-*\". Overlay image files and snapshot "
-"archive files have extensions which determines their filesystem or archive "
-"type, e.g. \"live-rw.ext3\" and \"\\home-sn.squashfs\"."
+"home, respectively (see I<live-snapshot>(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.ext3\" and \"\\home-sn.squashfs"
+"\"."
msgstr ""
#. type: IP
@@ -888,40 +887,51 @@ msgstr "B<live/boot.conf>"
msgid "B<live/boot.d/>"
msgstr "B<live/boot.d/>"
+#. type: IP
+#: en/live-boot.7:160
+#, no-wrap
+msgid "B<live.persist>"
+msgstr "B<live.persistent>"
+
#. type: SH
-#: en/live-boot.7:161 en/live-snapshot.1:54
+#: en/live-boot.7:162 en/live-snapshot.1:54 en/live.persist.5:191
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-boot.7:163
+#: en/live-boot.7:164
msgid "I<live-snapshot>(1)"
msgstr "I<live-snapshot>(1)"
#. type: Plain text
-#: en/live-boot.7:165 en/live-snapshot.1:58
+#: en/live-boot.7:166
+msgid "I<live.persist>(5)"
+msgstr "I<live.persist>(1)"
+
+#. type: Plain text
+#: en/live-boot.7:168 en/live-snapshot.1:58 en/live.persist.5:195
msgid "I<live-build>(7)"
msgstr "I<live-build>(7)"
#. type: Plain text
-#: en/live-boot.7:167 en/live-snapshot.1:60
+#: en/live-boot.7:170 en/live-snapshot.1:60 en/live.persist.5:197
msgid "I<live-config>(7)"
msgstr "I<live-config>(7)"
#. type: Plain text
-#: en/live-boot.7:169 en/live-snapshot.1:62
+#: en/live-boot.7:172 en/live-snapshot.1:62 en/live.persist.5:199
msgid "I<live-tools>(7)"
msgstr "I<live-tools>(7)"
#. type: SH
-#: en/live-boot.7:170 en/live-snapshot.1:63
+#: en/live-boot.7:173 en/live-snapshot.1:63 en/live.persist.5:200
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-boot.7:172 en/live-snapshot.1:65
+#: en/live-boot.7:175 en/live-snapshot.1:65 en/live.persist.5:204
msgid ""
"More information about live-boot 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 "
@@ -932,13 +942,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-boot.7:173 en/live-snapshot.1:66
+#: en/live-boot.7:176 en/live-snapshot.1:66 en/live.persist.5:205
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-boot.7:175 en/live-snapshot.1:68
+#: en/live-boot.7:178 en/live-snapshot.1:68 en/live.persist.5:210
msgid ""
"Bugs can be reported by submitting a bugreport for the live-boot package in "
"the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -952,13 +962,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-boot.7:176 en/live-snapshot.1:69
+#: en/live-boot.7:179 en/live-snapshot.1:69 en/live.persist.5:211
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-boot.7:177 en/live-snapshot.1:70
+#: en/live-boot.7:180 en/live-snapshot.1:70
msgid ""
"live-boot was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
"the Debian project."
diff --git a/manpages/po/de/live-snapshot.1.po b/manpages/po/de/live-snapshot.1.po
index 2041de2..35f08e9 100644
--- a/manpages/po/de/live-snapshot.1.po
+++ b/manpages/po/de/live-snapshot.1.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot 3.0~a22-1\n"
-"POT-Creation-Date: 2012-02-06 23:27+0100\n"
+"POT-Creation-Date: 2012-04-05 07:55+0300\n"
"PO-Revision-Date: 2010-05-24 12:34+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -16,45 +16,43 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1
+#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
#, no-wrap
msgid "LIVE-BOOT"
msgstr "LIVE-BOOT"
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1
-#, fuzzy, no-wrap
-#| msgid "2011-12-04"
-msgid "2012-02-06"
-msgstr "04.12.2011"
+#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#, no-wrap
+msgid "2012-04-05"
+msgstr "05.04.2012"
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1
-#, fuzzy, no-wrap
-#| msgid "3.0~a24-1"
+#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#, no-wrap
msgid "3.0~a25-1"
-msgstr "3.0~a24-1"
+msgstr "3.0~a25-1"
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1
+#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
#, no-wrap
msgid "Debian Live Project"
msgstr "Debian Live Projekt"
#. type: SH
-#: en/live-boot.7:3 en/live-snapshot.1:3
+#: en/live-boot.7:3 en/live-snapshot.1:3 en/live.persist.5:3
#, no-wrap
msgid "NAME"
msgstr "NAME"
#. type: SH
-#: en/live-boot.7:6 en/live-snapshot.1:17
+#: en/live-boot.7:6 en/live-snapshot.1:17 en/live.persist.5:7
#, no-wrap
msgid "DESCRIPTION"
msgstr "BESCHREIBUNG"
#. type: SH
-#: en/live-boot.7:28 en/live-snapshot.1:20
+#: en/live-boot.7:28 en/live-snapshot.1:20 en/live.persist.5:57
#, no-wrap
msgid "OPTIONS"
msgstr "OPTIONEN"
@@ -122,34 +120,34 @@ msgid "FILES"
msgstr "DATEIEN"
#. type: SH
-#: en/live-boot.7:161 en/live-snapshot.1:54
+#: en/live-boot.7:162 en/live-snapshot.1:54 en/live.persist.5:191
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-boot.7:165 en/live-snapshot.1:58
+#: en/live-boot.7:168 en/live-snapshot.1:58 en/live.persist.5:195
msgid "I<live-build>(7)"
msgstr "I<live-build>(7)"
#. type: Plain text
-#: en/live-boot.7:167 en/live-snapshot.1:60
+#: en/live-boot.7:170 en/live-snapshot.1:60 en/live.persist.5:197
msgid "I<live-config>(7)"
msgstr "I<live-config>(7)"
#. type: Plain text
-#: en/live-boot.7:169 en/live-snapshot.1:62
+#: en/live-boot.7:172 en/live-snapshot.1:62 en/live.persist.5:199
msgid "I<live-tools>(7)"
msgstr "I<live-tools>(7)"
#. type: SH
-#: en/live-boot.7:170 en/live-snapshot.1:63
+#: en/live-boot.7:173 en/live-snapshot.1:63 en/live.persist.5:200
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-boot.7:172 en/live-snapshot.1:65
+#: en/live-boot.7:175 en/live-snapshot.1:65 en/live.persist.5:204
msgid ""
"More information about live-boot 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 "
@@ -160,13 +158,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-boot.7:173 en/live-snapshot.1:66
+#: en/live-boot.7:176 en/live-snapshot.1:66 en/live.persist.5:205
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-boot.7:175 en/live-snapshot.1:68
+#: en/live-boot.7:178 en/live-snapshot.1:68 en/live.persist.5:210
msgid ""
"Bugs can be reported by submitting a bugreport for the live-boot package in "
"the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -180,13 +178,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-boot.7:176 en/live-snapshot.1:69
+#: en/live-boot.7:179 en/live-snapshot.1:69 en/live.persist.5:211
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-boot.7:177 en/live-snapshot.1:70
+#: en/live-boot.7:180 en/live-snapshot.1:70
msgid ""
"live-boot was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
"the Debian project."
diff --git a/manpages/po/de/live.persist.5.po b/manpages/po/de/live.persist.5.po
new file mode 100644
index 0000000..baa91bd
--- /dev/null
+++ b/manpages/po/de/live.persist.5.po
@@ -0,0 +1,520 @@
+# German translations for live-boot package
+# 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 VERSION\n"
+"POT-Creation-Date: 2012-04-05 07:58+0300\n"
+"PO-Revision-Date: 2012-04-05 07:55+0300\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ASCII\n"
+"Content-Transfer-Encoding: 8bit\n"
+"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
+#, no-wrap
+msgid "LIVE-BOOT"
+msgstr "LIVE-BOOT"
+
+#. type: TH
+#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#, no-wrap
+msgid "2012-04-05"
+msgstr "05.04.2012"
+
+#. type: TH
+#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#, no-wrap
+msgid "3.0~a25-1"
+msgstr "3.0~a25-1"
+
+#. type: TH
+#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#, no-wrap
+msgid "Debian Live Project"
+msgstr "Debian Live Projekt"
+
+#. type: SH
+#: en/live-boot.7:3 en/live-snapshot.1:3 en/live.persist.5:3
+#, no-wrap
+msgid "NAME"
+msgstr "NAME"
+
+#. type: SH
+#: en/live-boot.7:6 en/live-snapshot.1:17 en/live.persist.5:7
+#, no-wrap
+msgid "DESCRIPTION"
+msgstr "BESCHREIBUNG"
+
+#. type: SH
+#: en/live-boot.7:28 en/live-snapshot.1:20 en/live.persist.5:57
+#, no-wrap
+msgid "OPTIONS"
+msgstr "OPTIONEN"
+
+#. type: SH
+#: en/live-boot.7:162 en/live-snapshot.1:54 en/live.persist.5:191
+#, no-wrap
+msgid "SEE ALSO"
+msgstr "SIEHE AUCH"
+
+#. type: Plain text
+#: en/live-boot.7:168 en/live-snapshot.1:58 en/live.persist.5:195
+msgid "I<live-build>(7)"
+msgstr "I<live-build>(7)"
+
+#. type: Plain text
+#: en/live-boot.7:170 en/live-snapshot.1:60 en/live.persist.5:197
+msgid "I<live-config>(7)"
+msgstr "I<live-config>(7)"
+
+#. type: Plain text
+#: en/live-boot.7:172 en/live-snapshot.1:62 en/live.persist.5:199
+msgid "I<live-tools>(7)"
+msgstr "I<live-tools>(7)"
+
+#. type: SH
+#: en/live-boot.7:173 en/live-snapshot.1:63 en/live.persist.5:200
+#, no-wrap
+msgid "HOMEPAGE"
+msgstr "HOMEPAGE"
+
+#. type: Plain text
+#: en/live-boot.7:175 en/live-snapshot.1:65 en/live.persist.5:204
+msgid ""
+"More information about live-boot 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 "
+"E<lt>I<http://live.debian.net/manual/>E<gt>."
+msgstr ""
+"Weitere Informationen ueber live-boot und das Debian Live Projekt koennen "
+"auf der Homepage unter E<lt>I<http://live.debian.net/>E<gt> und im Handbuch "
+"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
+
+#. type: SH
+#: en/live-boot.7:176 en/live-snapshot.1:66 en/live.persist.5:205
+#, no-wrap
+msgid "BUGS"
+msgstr "FEHLER"
+
+#. type: Plain text
+#: en/live-boot.7:178 en/live-snapshot.1:68 en/live.persist.5:210
+msgid ""
+"Bugs can be reported by submitting a bugreport for the live-boot package in "
+"the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
+"writing a mail to the Debian Live mailing list at E<lt>I<debian-live at lists."
+"debian.org>E<gt>."
+msgstr ""
+"Fehler koennen durch Einreichen eines Fehlerberichtes fuer das live-boot "
+"Paket im Debian Bug Tracking System unter E<lt>I<http://bugs.debian.org/"
+">E<gt> oder durch Senden einer E-Mail an die Debian Live Mailing Liste unter "
+"E<lt>I<debian-live at lists.debian.org>E<gt> (englischsprachig) mitgeteilt "
+"werden."
+
+#. type: SH
+#: en/live-boot.7:179 en/live-snapshot.1:69 en/live.persist.5:211
+#, no-wrap
+msgid "AUTHOR"
+msgstr "AUTOR"
+
+#. type: Plain text
+#: en/live.persist.5:6
+msgid "B<live.persist> - Configuration file for persistent media in live-boot"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:13
+msgid ""
+"If live-boot probes a persistent 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<live.persist> 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
+msgid ""
+"The format of B<live.persist> 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
+msgid "I<DIR> [I<OPTION>]..."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:24
+msgid ""
+"which roughly translates to \"make I<DIR> persistent in the way described by "
+"the list of I<OPTION>s\"."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:35
+msgid ""
+"For each custom mount I<DIR> must be an absolute path that cannot contain "
+"white spaces or the special . and .. path components, and cannot be /live "
+"(or any of its sub-directories), or / (for the latter, use \"full-ov\" "
+"persistence instead). Once activated all changes (file deletion, creation "
+"and modification) to I<DIR> on the live file system are stored persistently "
+"into a path equivalent to I<DIR> on the persistent media, called the source "
+"directory. The default way to achieve persistence is to simply bind-mount "
+"the corresponding source directory to I<DIR>, but this can be changed "
+"through the use of I<OPTION>s."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:48
+msgid ""
+"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 I<DIR>: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 B<live.persist> are ordered, or if "
+"several B<live.persist> files on different persistent 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 "
+"B<source> option (see below) to make sure that they are stored in different "
+"source directories."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:56
+msgid ""
+"When a source directory doesn't exist on the persistent media for a certain "
+"custom mount, it will be created automatically, and permissions and "
+"ownership will be optimistically set according to I<DIR>. It will also be "
+"bootstrapped by copying the contents of the I<DIR> into its source directory "
+"on the persistent media. The bootstrapping will not happen when the "
+"B<linkfiles> or B<union> options are used (see below)."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:60
+msgid ""
+"Custom mounts defined in B<live.persist> accept the following options in a "
+"coma-separated list:"
+msgstr ""
+
+#. type: IP
+#: en/live.persist.5:60
+#, no-wrap
+msgid "B<source>=I<PATH>"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:69
+msgid ""
+"When given, store the persistent changes into I<PATH> on the persistent "
+"media. I<PATH> must be a relative path (w.r.t. the persistent media root) "
+"that cannot contain white spaces or the special . or .. path components, "
+"with the exception that it can be just . which means the persistent media "
+"root. This option is mostly relevant if you want to nest custom mounts, "
+"which otherwise would cause errors, or if you want to make the whole media "
+"root available (similar to the now deprecated B<home-rw> type of "
+"persistence)."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:72
+msgid ""
+"The following options are mutually exclusive (only the last given one will "
+"be in effect):"
+msgstr ""
+
+#. type: IP
+#: en/live.persist.5:72
+#, no-wrap
+msgid "B<bind>"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:74
+msgid "Bind-mount the source directory to I<DIR>. This is the default."
+msgstr ""
+
+#. type: IP
+#: en/live.persist.5:74
+#, no-wrap
+msgid "B<linkfiles>"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:83
+msgid ""
+"Create the directory structure of the source directory on the persistent "
+"media in I<DIR> and create symbolic links from the corresponding place in "
+"I<DIR> to each file in the source directory. Existing files or directories "
+"with the same name as any link will be overwritten. Note that deleting the "
+"links in I<DIR> will only remove the link, not the corresponding file in the "
+"source; removed links will reappear after a reboot. To permanently add or "
+"delete a file one must do so directly in the source directory."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:91
+msgid ""
+"Effectively B<linkfiles> will make only files already in the source "
+"directory persistent, not any other files in I<DIR>. These files must be "
+"manually added to the source directory to make use of this option, and they "
+"will appear in I<DIR> in addition to files already there. This option is "
+"useful when only certain files need to be persistent, not the whole "
+"directory they're in, e.g. some configuration files in a user's home "
+"directory."
+msgstr ""
+
+#. type: IP
+#: en/live.persist.5:91
+#, no-wrap
+msgid "B<union>"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:101
+msgid ""
+"Save the rw branch of a union on the persistent media, so only the changes "
+"are stored persistently. This can potentially reduce disk usage compared to "
+"bind-mounts, and will not hide files added to the read-only media. One "
+"caveat is that the union will use I<DIR> from the image's read-only file "
+"system, not the real file system root, so files created after boot (e.g. by "
+"live-config) will not appear in the union. This option will use the union "
+"file system specified by live-boot's B<union> boot parameter, but is not "
+"supported with B<union=unionmount>."
+msgstr ""
+
+#. type: SH
+#: en/live.persist.5:102
+#, no-wrap
+msgid "DIRECTORIES"
+msgstr ""
+
+#. type: IP
+#: en/live.persist.5:103
+#, no-wrap
+msgid "B</live/persistent>"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:109
+msgid ""
+"All persistent volumes will be mounted here (in a directory corresponding to "
+"the device name). The B<live.persist> file can easily be edited through this "
+"mount, as well as any source directories (which is especially practical for "
+"custom mounts using the B<linkfiles> option)."
+msgstr ""
+
+#. type: SH
+#: en/live.persist.5:110
+#, no-wrap
+msgid "EXAMPLES"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:115
+msgid ""
+"Let's say we have a persistent volume I<VOL> with the a B<live.persist> file "
+"containing the following four lines (numbered for ease of reference):"
+msgstr ""
+
+#. type: TP
+#: en/live.persist.5:115 en/live.persist.5:129
+#, no-wrap
+msgid "1."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:118
+msgid "/home/user1 linkfiles,source=config-files/user1"
+msgstr ""
+
+#. type: TP
+#: en/live.persist.5:118 en/live.persist.5:133
+#, no-wrap
+msgid "2."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:121
+msgid "/home/user2 linkfiles,source=config-files/user2"
+msgstr ""
+
+#. type: TP
+#: en/live.persist.5:121 en/live.persist.5:137
+#, no-wrap
+msgid "3."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:124
+msgid "/home"
+msgstr ""
+
+#. type: TP
+#: en/live.persist.5:124 en/live.persist.5:140
+#, no-wrap
+msgid "4."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:127
+msgid "/usr union"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:129
+msgid "The corresponding source directories are:"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:133
+msgid ""
+"I<VOL>/config-files/user1 (but it would be I<VOL>/home/user1 without the "
+"B<source> option)"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:137
+msgid ""
+"I<VOL>/config-files/user2 (but it would be I<VOL>/home/user2 without the "
+"B<source> option)"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:140
+msgid "I<VOL>/home"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:143
+msgid "I<VOL>/usr"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:146
+msgid ""
+"It was necessary to set the B<source> options for 1 and 2, since they "
+"otherwise would become nested with 3's source, which is illegal."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:151
+msgid ""
+"Line 3 will be taken care of before line 1 and 2 in order to prevent custom "
+"mounts 1 and 2 from being hidden by 3. When line 3 is handled, I<VOL>/home "
+"is simply bind-mounted on /home. To illustrate what happens for lines 1 and "
+"2, let's say that the following files exist:"
+msgstr ""
+
+#. type: TP
+#: en/live.persist.5:151
+#, no-wrap
+msgid "a."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:154
+msgid "I<VOL>/config-files/user1/.emacs"
+msgstr ""
+
+#. type: TP
+#: en/live.persist.5:154
+#, no-wrap
+msgid "b."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:157
+msgid "I<VOL>/config-files/user2/.bashrc"
+msgstr ""
+
+#. type: TP
+#: en/live.persist.5:157
+#, no-wrap
+msgid "c."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:160
+msgid "I<VOL>/config-files/user2/.ssh/config"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:162
+msgid "Then the following links and directories will be created:"
+msgstr ""
+
+#. type: TP
+#: en/live.persist.5:162 en/live.persist.5:165 en/live.persist.5:171
+#, no-wrap
+msgid "Link:"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:165
+msgid "/home/user1/.emacs -E<gt> I<VOL>/config-files/user1/.emacs (from a)"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:168
+msgid "/home/user2/.bashrc -E<gt> I<VOL>/config-files/user2/.bashrc (from b)"
+msgstr ""
+
+#. type: TP
+#: en/live.persist.5:168
+#, no-wrap
+msgid "Dir:"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:171
+msgid "/homea/user2/.ssh (from c)"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:175
+msgid ""
+"/home/user2/.ssh/config -E<gt> I<VOL>/config-files/user2/.ssh/config (from c)"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:181
+msgid ""
+"One could argue, though, that lines 1 and 2 in the example B<live.persist> "
+"file above are unnecessary since line 3 already would make all of /home "
+"persistent. The B<linkfiles> 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."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:190
+msgid ""
+"Line 4 can be mounted at any time since its I<DIR> (and source directory) is "
+"completely disjoint from all the other custom mounts. When mounted, I<VOL>/"
+"usr will be the rw branch due to the B<union> option, and will only contain "
+"the difference compared to the underlying read-only file system. Hence "
+"packages could be installed into /usr with great space-wise efficiency "
+"compared to bind-mounts, since in the latter case all of /usr would have to "
+"be copied into I<VOL>/usr during the initial bootstrap."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:193
+msgid "I<live-boot>(7)"
+msgstr "I<live-boot>(7)"
+
+#. type: Plain text
+#: en/live.persist.5:213
+msgid ""
+"live.persist was written by anonym E<lt>I<anonym at lavabit.com>E<gt> for the "
+"Debian project."
+msgstr ""
diff --git a/manpages/po4a.cfg b/manpages/po4a.cfg
index c0b056e..4d52b0f 100644
--- a/manpages/po4a.cfg
+++ b/manpages/po4a.cfg
@@ -2,3 +2,4 @@
[po4a_paths] pot/$master.pot $lang:po/$lang/$master.po
[type: man] en/live-boot.7 $lang:$lang/live-boot.$lang.7
[type: man] en/live-snapshot.1 $lang:$lang/live-snapshot.$lang.1
+[type: man] en/live.persist.5 $lang:$lang/live.persist.5.$lang.persist
diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 7f46b3a..4a2df71 100644
--- a/manpages/pot/live-boot.7.pot
+++ b/manpages/pot/live-boot.7.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-02-06 23:27+0100\n"
+"POT-Creation-Date: 2012-04-05 07:55+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,31 +17,31 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1
+#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
#, no-wrap
msgid "LIVE-BOOT"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1
+#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
#, no-wrap
-msgid "2012-02-06"
+msgid "2012-04-05"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1
+#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
#, no-wrap
msgid "3.0~a25-1"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1
+#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
#, no-wrap
msgid "Debian Live Project"
msgstr ""
#. type: SH
-#: en/live-boot.7:3 en/live-snapshot.1:3
+#: en/live-boot.7:3 en/live-snapshot.1:3 en/live.persist.5:3
#, no-wrap
msgid "NAME"
msgstr ""
@@ -52,7 +52,7 @@ msgid "B<live-boot> - System Boot Scripts"
msgstr ""
#. type: SH
-#: en/live-boot.7:6 en/live-snapshot.1:17
+#: en/live-boot.7:6 en/live-snapshot.1:17 en/live.persist.5:7
#, no-wrap
msgid "DESCRIPTION"
msgstr ""
@@ -138,7 +138,7 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:28 en/live-snapshot.1:20
+#: en/live-boot.7:28 en/live-snapshot.1:20 en/live.persist.5:57
#, no-wrap
msgid "OPTIONS"
msgstr ""
@@ -558,16 +558,17 @@ msgstr ""
#. type: Plain text
#: en/live-boot.7:111
msgid ""
-"live-boot will probe filesystems for persistent media. These can either be "
-"the filesystems themselves, if labeled correctly, or image/archive files, if "
-"named correctly. Overlays are labeled/named either \"live-rw\" or \"home-rw"
-"\" and will be mounted on / or /home, respectively; snapshots are labeled/"
+"live-boot will probe devices for persistent 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<live.persist>(5)); snapshots are labeled/"
"named either \"live-sn\" or \"home-sn\" and will be extracted into / or /"
-"home, respectively (see live-snapshot(1) for more information). Overlays are "
-"mounted before snapshots are extracted, and for both overlays and snapshots, "
-"\"live-*\" are handled before \"home-*\". Overlay image files and snapshot "
-"archive files have extensions which determines their filesystem or archive "
-"type, e.g. \"live-rw.ext3\" and \"\\home-sn.squashfs\"."
+"home, respectively (see I<live-snapshot>(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.ext3\" and \"\\home-sn.squashfs"
+"\"."
msgstr ""
#. type: IP
@@ -881,40 +882,51 @@ msgstr ""
msgid "B<live/boot.d/>"
msgstr ""
+#. type: IP
+#: en/live-boot.7:160
+#, no-wrap
+msgid "B<live.persist>"
+msgstr ""
+
#. type: SH
-#: en/live-boot.7:161 en/live-snapshot.1:54
+#: en/live-boot.7:162 en/live-snapshot.1:54 en/live.persist.5:191
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:163
+#: en/live-boot.7:164
msgid "I<live-snapshot>(1)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:165 en/live-snapshot.1:58
+#: en/live-boot.7:166
+msgid "I<live.persist>(5)"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:168 en/live-snapshot.1:58 en/live.persist.5:195
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:167 en/live-snapshot.1:60
+#: en/live-boot.7:170 en/live-snapshot.1:60 en/live.persist.5:197
msgid "I<live-config>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:169 en/live-snapshot.1:62
+#: en/live-boot.7:172 en/live-snapshot.1:62 en/live.persist.5:199
msgid "I<live-tools>(7)"
msgstr ""
#. type: SH
-#: en/live-boot.7:170 en/live-snapshot.1:63
+#: en/live-boot.7:173 en/live-snapshot.1:63 en/live.persist.5:200
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:172 en/live-snapshot.1:65
+#: en/live-boot.7:175 en/live-snapshot.1:65 en/live.persist.5:204
msgid ""
"More information about live-boot 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 "
@@ -922,13 +934,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:173 en/live-snapshot.1:66
+#: en/live-boot.7:176 en/live-snapshot.1:66 en/live.persist.5:205
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:175 en/live-snapshot.1:68
+#: en/live-boot.7:178 en/live-snapshot.1:68 en/live.persist.5:210
msgid ""
"Bugs can be reported by submitting a bugreport for the live-boot package in "
"the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -937,13 +949,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:176 en/live-snapshot.1:69
+#: en/live-boot.7:179 en/live-snapshot.1:69 en/live.persist.5:211
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:177 en/live-snapshot.1:70
+#: en/live-boot.7:180 en/live-snapshot.1:70
msgid ""
"live-boot was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
"the Debian project."
diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index ab3ee0f..ac8d92f 100644
--- a/manpages/pot/live-snapshot.1.pot
+++ b/manpages/pot/live-snapshot.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-02-06 23:27+0100\n"
+"POT-Creation-Date: 2012-04-05 07:55+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,43 +17,43 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1
+#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
#, no-wrap
msgid "LIVE-BOOT"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1
+#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
#, no-wrap
-msgid "2012-02-06"
+msgid "2012-04-05"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1
+#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
#, no-wrap
msgid "3.0~a25-1"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1
+#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
#, no-wrap
msgid "Debian Live Project"
msgstr ""
#. type: SH
-#: en/live-boot.7:3 en/live-snapshot.1:3
+#: en/live-boot.7:3 en/live-snapshot.1:3 en/live.persist.5:3
#, no-wrap
msgid "NAME"
msgstr ""
#. type: SH
-#: en/live-boot.7:6 en/live-snapshot.1:17
+#: en/live-boot.7:6 en/live-snapshot.1:17 en/live.persist.5:7
#, no-wrap
msgid "DESCRIPTION"
msgstr ""
#. type: SH
-#: en/live-boot.7:28 en/live-snapshot.1:20
+#: en/live-boot.7:28 en/live-snapshot.1:20 en/live.persist.5:57
#, no-wrap
msgid "OPTIONS"
msgstr ""
@@ -121,34 +121,34 @@ msgid "FILES"
msgstr ""
#. type: SH
-#: en/live-boot.7:161 en/live-snapshot.1:54
+#: en/live-boot.7:162 en/live-snapshot.1:54 en/live.persist.5:191
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:165 en/live-snapshot.1:58
+#: en/live-boot.7:168 en/live-snapshot.1:58 en/live.persist.5:195
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:167 en/live-snapshot.1:60
+#: en/live-boot.7:170 en/live-snapshot.1:60 en/live.persist.5:197
msgid "I<live-config>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:169 en/live-snapshot.1:62
+#: en/live-boot.7:172 en/live-snapshot.1:62 en/live.persist.5:199
msgid "I<live-tools>(7)"
msgstr ""
#. type: SH
-#: en/live-boot.7:170 en/live-snapshot.1:63
+#: en/live-boot.7:173 en/live-snapshot.1:63 en/live.persist.5:200
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:172 en/live-snapshot.1:65
+#: en/live-boot.7:175 en/live-snapshot.1:65 en/live.persist.5:204
msgid ""
"More information about live-boot 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 "
@@ -156,13 +156,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:173 en/live-snapshot.1:66
+#: en/live-boot.7:176 en/live-snapshot.1:66 en/live.persist.5:205
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:175 en/live-snapshot.1:68
+#: en/live-boot.7:178 en/live-snapshot.1:68 en/live.persist.5:210
msgid ""
"Bugs can be reported by submitting a bugreport for the live-boot package in "
"the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -171,13 +171,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:176 en/live-snapshot.1:69
+#: en/live-boot.7:179 en/live-snapshot.1:69 en/live.persist.5:211
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:177 en/live-snapshot.1:70
+#: en/live-boot.7:180 en/live-snapshot.1:70
msgid ""
"live-boot was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
"the Debian project."
diff --git a/manpages/pot/live.persist.5.pot b/manpages/pot/live.persist.5.pot
new file mode 100644
index 0000000..c40ec9c
--- /dev/null
+++ b/manpages/pot/live.persist.5.pot
@@ -0,0 +1,512 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-boot package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: live-boot VERSION\n"
+"POT-Creation-Date: 2012-04-05 07:58+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: TH
+#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#, no-wrap
+msgid "LIVE-BOOT"
+msgstr ""
+
+#. type: TH
+#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#, no-wrap
+msgid "2012-04-05"
+msgstr ""
+
+#. type: TH
+#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#, no-wrap
+msgid "3.0~a25-1"
+msgstr ""
+
+#. type: TH
+#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5: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
+#, no-wrap
+msgid "NAME"
+msgstr ""
+
+#. type: SH
+#: en/live-boot.7:6 en/live-snapshot.1:17 en/live.persist.5:7
+#, no-wrap
+msgid "DESCRIPTION"
+msgstr ""
+
+#. type: SH
+#: en/live-boot.7:28 en/live-snapshot.1:20 en/live.persist.5:57
+#, no-wrap
+msgid "OPTIONS"
+msgstr ""
+
+#. type: SH
+#: en/live-boot.7:162 en/live-snapshot.1:54 en/live.persist.5:191
+#, no-wrap
+msgid "SEE ALSO"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:168 en/live-snapshot.1:58 en/live.persist.5:195
+msgid "I<live-build>(7)"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:170 en/live-snapshot.1:60 en/live.persist.5:197
+msgid "I<live-config>(7)"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:172 en/live-snapshot.1:62 en/live.persist.5:199
+msgid "I<live-tools>(7)"
+msgstr ""
+
+#. type: SH
+#: en/live-boot.7:173 en/live-snapshot.1:63 en/live.persist.5:200
+#, no-wrap
+msgid "HOMEPAGE"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:175 en/live-snapshot.1:65 en/live.persist.5:204
+msgid ""
+"More information about live-boot 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 "
+"E<lt>I<http://live.debian.net/manual/>E<gt>."
+msgstr ""
+
+#. type: SH
+#: en/live-boot.7:176 en/live-snapshot.1:66 en/live.persist.5:205
+#, no-wrap
+msgid "BUGS"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:178 en/live-snapshot.1:68 en/live.persist.5:210
+msgid ""
+"Bugs can be reported by submitting a bugreport for the live-boot package in "
+"the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
+"writing a mail to the Debian Live mailing list at E<lt>I<debian-live at lists."
+"debian.org>E<gt>."
+msgstr ""
+
+#. type: SH
+#: en/live-boot.7:179 en/live-snapshot.1:69 en/live.persist.5:211
+#, no-wrap
+msgid "AUTHOR"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:6
+msgid "B<live.persist> - Configuration file for persistent media in live-boot"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:13
+msgid ""
+"If live-boot probes a persistent 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<live.persist> 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
+msgid ""
+"The format of B<live.persist> 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
+msgid "I<DIR> [I<OPTION>]..."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:24
+msgid ""
+"which roughly translates to \"make I<DIR> persistent in the way described by "
+"the list of I<OPTION>s\"."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:35
+msgid ""
+"For each custom mount I<DIR> must be an absolute path that cannot contain "
+"white spaces or the special . and .. path components, and cannot be /live "
+"(or any of its sub-directories), or / (for the latter, use \"full-ov\" "
+"persistence instead). Once activated all changes (file deletion, creation "
+"and modification) to I<DIR> on the live file system are stored persistently "
+"into a path equivalent to I<DIR> on the persistent media, called the source "
+"directory. The default way to achieve persistence is to simply bind-mount "
+"the corresponding source directory to I<DIR>, but this can be changed "
+"through the use of I<OPTION>s."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:48
+msgid ""
+"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 I<DIR>: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 B<live.persist> are ordered, or if "
+"several B<live.persist> files on different persistent 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 "
+"B<source> option (see below) to make sure that they are stored in different "
+"source directories."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:56
+msgid ""
+"When a source directory doesn't exist on the persistent media for a certain "
+"custom mount, it will be created automatically, and permissions and "
+"ownership will be optimistically set according to I<DIR>. It will also be "
+"bootstrapped by copying the contents of the I<DIR> into its source directory "
+"on the persistent media. The bootstrapping will not happen when the "
+"B<linkfiles> or B<union> options are used (see below)."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:60
+msgid ""
+"Custom mounts defined in B<live.persist> accept the following options in a "
+"coma-separated list:"
+msgstr ""
+
+#. type: IP
+#: en/live.persist.5:60
+#, no-wrap
+msgid "B<source>=I<PATH>"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:69
+msgid ""
+"When given, store the persistent changes into I<PATH> on the persistent "
+"media. I<PATH> must be a relative path (w.r.t. the persistent media root) "
+"that cannot contain white spaces or the special . or .. path components, "
+"with the exception that it can be just . which means the persistent media "
+"root. This option is mostly relevant if you want to nest custom mounts, "
+"which otherwise would cause errors, or if you want to make the whole media "
+"root available (similar to the now deprecated B<home-rw> type of "
+"persistence)."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:72
+msgid ""
+"The following options are mutually exclusive (only the last given one will "
+"be in effect):"
+msgstr ""
+
+#. type: IP
+#: en/live.persist.5:72
+#, no-wrap
+msgid "B<bind>"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:74
+msgid "Bind-mount the source directory to I<DIR>. This is the default."
+msgstr ""
+
+#. type: IP
+#: en/live.persist.5:74
+#, no-wrap
+msgid "B<linkfiles>"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:83
+msgid ""
+"Create the directory structure of the source directory on the persistent "
+"media in I<DIR> and create symbolic links from the corresponding place in "
+"I<DIR> to each file in the source directory. Existing files or directories "
+"with the same name as any link will be overwritten. Note that deleting the "
+"links in I<DIR> will only remove the link, not the corresponding file in the "
+"source; removed links will reappear after a reboot. To permanently add or "
+"delete a file one must do so directly in the source directory."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:91
+msgid ""
+"Effectively B<linkfiles> will make only files already in the source "
+"directory persistent, not any other files in I<DIR>. These files must be "
+"manually added to the source directory to make use of this option, and they "
+"will appear in I<DIR> in addition to files already there. This option is "
+"useful when only certain files need to be persistent, not the whole "
+"directory they're in, e.g. some configuration files in a user's home "
+"directory."
+msgstr ""
+
+#. type: IP
+#: en/live.persist.5:91
+#, no-wrap
+msgid "B<union>"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:101
+msgid ""
+"Save the rw branch of a union on the persistent media, so only the changes "
+"are stored persistently. This can potentially reduce disk usage compared to "
+"bind-mounts, and will not hide files added to the read-only media. One "
+"caveat is that the union will use I<DIR> from the image's read-only file "
+"system, not the real file system root, so files created after boot (e.g. by "
+"live-config) will not appear in the union. This option will use the union "
+"file system specified by live-boot's B<union> boot parameter, but is not "
+"supported with B<union=unionmount>."
+msgstr ""
+
+#. type: SH
+#: en/live.persist.5:102
+#, no-wrap
+msgid "DIRECTORIES"
+msgstr ""
+
+#. type: IP
+#: en/live.persist.5:103
+#, no-wrap
+msgid "B</live/persistent>"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:109
+msgid ""
+"All persistent volumes will be mounted here (in a directory corresponding to "
+"the device name). The B<live.persist> file can easily be edited through this "
+"mount, as well as any source directories (which is especially practical for "
+"custom mounts using the B<linkfiles> option)."
+msgstr ""
+
+#. type: SH
+#: en/live.persist.5:110
+#, no-wrap
+msgid "EXAMPLES"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:115
+msgid ""
+"Let's say we have a persistent volume I<VOL> with the a B<live.persist> file "
+"containing the following four lines (numbered for ease of reference):"
+msgstr ""
+
+#. type: TP
+#: en/live.persist.5:115 en/live.persist.5:129
+#, no-wrap
+msgid "1."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:118
+msgid "/home/user1 linkfiles,source=config-files/user1"
+msgstr ""
+
+#. type: TP
+#: en/live.persist.5:118 en/live.persist.5:133
+#, no-wrap
+msgid "2."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:121
+msgid "/home/user2 linkfiles,source=config-files/user2"
+msgstr ""
+
+#. type: TP
+#: en/live.persist.5:121 en/live.persist.5:137
+#, no-wrap
+msgid "3."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:124
+msgid "/home"
+msgstr ""
+
+#. type: TP
+#: en/live.persist.5:124 en/live.persist.5:140
+#, no-wrap
+msgid "4."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:127
+msgid "/usr union"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:129
+msgid "The corresponding source directories are:"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:133
+msgid ""
+"I<VOL>/config-files/user1 (but it would be I<VOL>/home/user1 without the "
+"B<source> option)"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:137
+msgid ""
+"I<VOL>/config-files/user2 (but it would be I<VOL>/home/user2 without the "
+"B<source> option)"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:140
+msgid "I<VOL>/home"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:143
+msgid "I<VOL>/usr"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:146
+msgid ""
+"It was necessary to set the B<source> options for 1 and 2, since they "
+"otherwise would become nested with 3's source, which is illegal."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:151
+msgid ""
+"Line 3 will be taken care of before line 1 and 2 in order to prevent custom "
+"mounts 1 and 2 from being hidden by 3. When line 3 is handled, I<VOL>/home "
+"is simply bind-mounted on /home. To illustrate what happens for lines 1 and "
+"2, let's say that the following files exist:"
+msgstr ""
+
+#. type: TP
+#: en/live.persist.5:151
+#, no-wrap
+msgid "a."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:154
+msgid "I<VOL>/config-files/user1/.emacs"
+msgstr ""
+
+#. type: TP
+#: en/live.persist.5:154
+#, no-wrap
+msgid "b."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:157
+msgid "I<VOL>/config-files/user2/.bashrc"
+msgstr ""
+
+#. type: TP
+#: en/live.persist.5:157
+#, no-wrap
+msgid "c."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:160
+msgid "I<VOL>/config-files/user2/.ssh/config"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:162
+msgid "Then the following links and directories will be created:"
+msgstr ""
+
+#. type: TP
+#: en/live.persist.5:162 en/live.persist.5:165 en/live.persist.5:171
+#, no-wrap
+msgid "Link:"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:165
+msgid "/home/user1/.emacs -E<gt> I<VOL>/config-files/user1/.emacs (from a)"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:168
+msgid "/home/user2/.bashrc -E<gt> I<VOL>/config-files/user2/.bashrc (from b)"
+msgstr ""
+
+#. type: TP
+#: en/live.persist.5:168
+#, no-wrap
+msgid "Dir:"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:171
+msgid "/homea/user2/.ssh (from c)"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:175
+msgid ""
+"/home/user2/.ssh/config -E<gt> I<VOL>/config-files/user2/.ssh/config (from c)"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:181
+msgid ""
+"One could argue, though, that lines 1 and 2 in the example B<live.persist> "
+"file above are unnecessary since line 3 already would make all of /home "
+"persistent. The B<linkfiles> 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."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:190
+msgid ""
+"Line 4 can be mounted at any time since its I<DIR> (and source directory) is "
+"completely disjoint from all the other custom mounts. When mounted, I<VOL>/"
+"usr will be the rw branch due to the B<union> option, and will only contain "
+"the difference compared to the underlying read-only file system. Hence "
+"packages could be installed into /usr with great space-wise efficiency "
+"compared to bind-mounts, since in the latter case all of /usr would have to "
+"be copied into I<VOL>/usr during the initial bootstrap."
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:193
+msgid "I<live-boot>(7)"
+msgstr ""
+
+#. type: Plain text
+#: en/live.persist.5:213
+msgid ""
+"live.persist was written by anonym E<lt>I<anonym at lavabit.com>E<gt> for the "
+"Debian project."
+msgstr ""
--
live-boot
More information about the debian-live-changes
mailing list