[SCM] live-boot branch, debian, updated. debian/3.0_a22-1-26-g36ebde9
Daniel Baumann
daniel at debian.org
Mon Nov 28 17:30:07 UTC 2011
The following commit has been merged in the debian branch:
commit 36ebde9b06f4b0d9be5cb6df567561dbbede2026
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Nov 28 18:27:29 2011 +0100
Releasing debian version 3.0~a23-1.
diff --git a/VERSION b/VERSION
index 812267e..e81be35 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a22-1
+3.0~a23-1
diff --git a/debian/changelog b/debian/changelog
index 697aae8..beef519 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,42 @@
+live-boot (3.0~a23-1) unstable; urgency=low
+
+ [ Tails developers ]
+ * Enabling whiteouts support for aufs.
+
+ [ Daniel Baumann ]
+ * Update udevs path_id changes as of version 174, thanks to Baurzhan
+ Muftakhidinov <baurthefirst at gmail.com> for spotting it.
+
+ [ Tails developers ]
+ * Adding persistent-encryption={none|luks}.
+ * Making persistent-encryption=luks strict.
+ * Making sure dm-crypt is loaded when dealing with LUKS devices.
+ * Adding persistent-storage=TYPE...
+ * Removing now obsolete persistent=* arguments.
+ * Adding persistent-method=METHOD...
+ * Fixing an incorrectly redirected newline.
+ * Clarifying what happens when you don't retry decrypting a device.
+ * Refactoring device scanning in find_{cow_device,files}.
+ * Making use of is_supported_fs in find_cow_devices (like in
+ find_files).
+ * Refactoring overlay and snapshot scanning code.
+ * Fixing a "sh: bad number" when $offset is not passed to
+ setup_loop().
+ * Disabling persistent-encryption=luks if dependencies are
+ unavailable.
+ * Adding persistent-read-only boot parameter.
+ * Changing persistent-encryption to accept a list TYPE... instead.
+ * Updating live-boot man page for persistent-encryption.
+ * Updating live-boot man page for persistent-storage.
+ * Updating live-boot man page for persistent-method.
+ * Updating and rewording live-boot man page for the persistent option.
+ * Making persistent-read-only work for home-rw overlays.
+ * Making persistent-read-only work for live-rw overlays.
+ * Updating live-boot man page for persistent-read-only.
+ * Adding workaround for a busybox bug with grep -w.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 28 Nov 2011 18:26:11 +0100
+
live-boot (3.0~a22-1) unstable; urgency=low
[ Daniel Baumann ]
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 5f39939..53f873d 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 04.11.2011 3.0~a22\-1 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 28.11.2011 3.0~a23\-1 "Debian Live Projekt"
.SH NAME
\fBlive\-boot\fP \- System Boot Skripte
@@ -172,30 +172,47 @@ default of mount applies (currently 50% of available RAM). Note that this
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[={nofiles|cryptsetup}] 4
-live\-boot will look for persistent and snapshot partitions or files labeled
-"live\-rw", "home\-rw", and files called "live\-sn*", "home\-sn*" and will try
-to, in order: mount as /cow the first, mount the second in /home, and just
-copy the contents of the latter in appropriate locations
-(snapshots). Snapshots will be tried to be updated on reboot/shutdown. Look
-at live\-snapshot(1) for more informations.
-.br
-If "nofiles" is specified, only filesystems with matching labels will be
-searched; no filesystems will be traversed looking for archives or image
-files. This results in shorter boot times.
-.br
-If "cryptsetup" is specified, filesystems stored on Luks\-encrypted devices
-will be considered as well as others when searching for a persistence
-filesystem; the user will be prompted for any needed decryption passphrase.
+.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
+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".
+.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
+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 \fBpersistent\-media\fP={\fIremovable\fP|\fIremovable\-usb\fP} 4
If you specify the keyword 'removable', live\-boot will try to find
persistent and snapshot partitions on removable media only. Note that if you
want to further restrict the media to usb mass storage only, you can use the
\&'removable\-usb' keyword.
+.IP "\fBpersistent\-method\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4
+This option determines which types of persistent media we allow. If
+"overlay" is in the list, we consider overlays (i.e. "live\-rw" and
+"home\-rw"); if "snapshot" is in the list, we consider snapshots
+(i.e. "live\-sn" and "home\-sn"). The default is "overlay,snapshot".
.IP \fBpersistent\-path\fP=\fIPATH\fP 4
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
have multiple directories on the same partition to store persistency files.
+.IP \fBpersistent\-read\-only\fP 4
+Filesystem changes are not saved back to persistent media. In particular,
+overlays and netboot NFS mounts are mounted read\-only, and snapshots are not
+resynced on shutdown.
+.IP "\fBpersistent\-storage\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4
+This option determines which types of persistent storage to consider when
+probing for persistent media. If "filesystem" is in the list, filesystems
+with matching labels will be used; if "file" is in the list, all filesystems
+will be probed for archives and image files with matching filenames. The
+default is "file,filesystem".
.IP \fBpersistent\-subtext\fP=\fISUFFIX\fP 4
Add a suffix when searching for the image filenames or partition labels to
use for the above mentioned persistent feature, the SUFFIX will be added
diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index 9d569a6..1e2aa36 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 04.11.2011 3.0~a22\-1 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 28.11.2011 3.0~a23\-1 "Debian Live Projekt"
.SH NAME
\fBlive\-snapshot\fP \- simple script to ease persistence usage
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 6fe4df9..d5a816d 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2011\-11\-04 3.0~a22-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2011\-11\-28 3.0~a23-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 2f38743..9d0cee6 100644
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2011\-11\-04 3.0~a22-1 "Debian Live Project"
+.TH LIVE\-BOOT 1 2011\-11\-28 3.0~a23-1 "Debian Live Project"
.SH NAME
\fBlive\-snapshot\fR \- simple script to ease persistence usage
diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index 770c7d1..333a00f 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: 2011-11-04 11:37+0100\n"
+"POT-Creation-Date: 2011-11-28 18:26+0100\n"
"PO-Revision-Date: 2010-05-24 12:34+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2011-11-04"
-msgstr "04.11.2011"
+msgid "2011-11-28"
+msgstr "28.11.2011"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "3.0~a22-1"
-msgstr "3.0~a22-1"
+msgid "3.0~a23-1"
+msgstr "3.0~a23-1"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
@@ -557,49 +557,68 @@ msgstr ""
#. type: IP
#: en/live-boot.7:109
#, no-wrap
-msgid "B<persistent>[={nofiles|cryptsetup}]"
-msgstr ""
+msgid "B<persistent>"
+msgstr "B<persistent>"
#. type: Plain text
#: en/live-boot.7:111
msgid ""
-"live-boot will look for persistent and snapshot partitions or files labeled "
-"\"live-rw\", \"home-rw\", and files called \"live-sn*\", \"home-sn*\" and "
-"will try to, in order: mount as /cow the first, mount the second in /home, "
-"and just copy the contents of the latter in appropriate locations "
-"(snapshots). Snapshots will be tried to be updated on reboot/shutdown. Look "
-"at live-snapshot(1) for more informations."
+"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 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\"."
+msgstr ""
+
+#. type: IP
+#: en/live-boot.7:111
+#, no-wrap
+msgid "B<persistent-encryption>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:113
msgid ""
-"If \"nofiles\" is specified, only filesystems with matching labels will be "
-"searched; no filesystems will be traversed looking for archives or image "
-"files. This results in shorter boot times."
+"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 "
+"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\"."
+msgstr ""
+
+#. type: IP
+#: en/live-boot.7:113
+#, no-wrap
+msgid "B<persistent-media>={I<removable>|I<removable-usb>}"
msgstr ""
#. type: Plain text
#: en/live-boot.7:115
msgid ""
-"If \"cryptsetup\" is specified, filesystems stored on Luks-encrypted devices "
-"will be considered as well as others when searching for a persistence "
-"filesystem; the user will be prompted for any needed decryption passphrase."
+"If you specify the keyword 'removable', live-boot will try to find "
+"persistent and snapshot partitions on removable media only. Note that if you "
+"want to further restrict the media to usb mass storage only, you can use the "
+"'removable-usb' keyword."
msgstr ""
#. type: IP
#: en/live-boot.7:115
#, no-wrap
-msgid "B<persistent-media>={I<removable>|I<removable-usb>}"
+msgid "B<persistent-method>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:117
msgid ""
-"If you specify the keyword 'removable', live-boot will try to find "
-"persistent and snapshot partitions on removable media only. Note that if you "
-"want to further restrict the media to usb mass storage only, you can use the "
-"'removable-usb' keyword."
+"This option determines which types of persistent media we allow. If \"overlay"
+"\" is in the list, we consider overlays (i.e. \"live-rw\" and \"home-rw\"); "
+"if \"snapshot\" is in the list, we consider snapshots (i.e. \"live-sn\" and "
+"\"home-sn\"). The default is \"overlay,snapshot\"."
msgstr ""
#. type: IP
@@ -619,11 +638,41 @@ msgstr ""
#. type: IP
#: en/live-boot.7:119
#, no-wrap
+msgid "B<persistent-read-only>"
+msgstr "B<persistent-read-only>"
+
+#. type: Plain text
+#: en/live-boot.7:121
+msgid ""
+"Filesystem changes are not saved back to persistent media. In particular, "
+"overlays and netboot NFS mounts are mounted read-only, and snapshots are not "
+"resynced on shutdown."
+msgstr ""
+
+#. type: IP
+#: en/live-boot.7:121
+#, no-wrap
+msgid "B<persistent-storage>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:123
+msgid ""
+"This option determines which types of persistent storage to consider when "
+"probing for persistent media. If \"filesystem\" is in the list, filesystems "
+"with matching labels will be used; if \"file\" is in the list, all "
+"filesystems will be probed for archives and image files with matching "
+"filenames. The default is \"file,filesystem\"."
+msgstr ""
+
+#. type: IP
+#: en/live-boot.7:123
+#, no-wrap
msgid "B<persistent-subtext>=I<SUFFIX>"
msgstr "B<persistent-subtext>=I<SUFFIX>"
#. type: Plain text
-#: en/live-boot.7:121
+#: en/live-boot.7:125
msgid ""
"Add a suffix when searching for the image filenames or partition labels to "
"use for the above mentioned persistent feature, the SUFFIX will be added "
@@ -633,26 +682,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:121
+#: en/live-boot.7:125
#, no-wrap
msgid "{B<preseed/file>|B<file>}=I<FILE>"
msgstr "{B<preseed/file>|B<file>}=I<FILE>"
#. type: Plain text
-#: en/live-boot.7:123
+#: en/live-boot.7:127
msgid ""
"A path to a file present on the rootfs could be used to preseed debconf "
"database."
msgstr ""
#. type: IP
-#: en/live-boot.7:123
+#: en/live-boot.7:127
#, no-wrap
msgid "B<package/question>=I<VALUE>"
msgstr "B<package/question>=I<VALUE>"
#. type: Plain text
-#: en/live-boot.7:125
+#: en/live-boot.7:129
msgid ""
"All debian installed packages could be preseeded from command-line that way, "
"beware of blanks spaces, they will interfere with parsing, use a preseed "
@@ -660,26 +709,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:125
+#: en/live-boot.7:129
#, no-wrap
msgid "B<quickreboot>"
msgstr "B<quickreboot>"
#. type: Plain text
-#: en/live-boot.7:127
+#: en/live-boot.7:131
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:131
#, no-wrap
msgid "B<showmounts>"
msgstr "B<showmounts>"
#. type: Plain text
-#: en/live-boot.7:129
+#: en/live-boot.7:133
msgid ""
"This parameter will make live-boot to show on \"/\" the ro filesystems "
"(mostly compressed) on \"/live\". This is not enabled by default because "
@@ -688,26 +737,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:129
+#: en/live-boot.7:133
#, no-wrap
msgid "B<silent>"
msgstr "B<silent>"
#. type: Plain text
-#: en/live-boot.7:131
+#: en/live-boot.7:135
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:135
#, no-wrap
msgid "B<todisk>=I<DEVICE>"
msgstr "B<todisk>=I<DEVICE>"
#. type: Plain text
-#: en/live-boot.7:133
+#: en/live-boot.7:137
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 "
@@ -717,13 +766,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:133
+#: en/live-boot.7:137
#, no-wrap
msgid "B<toram>"
msgstr "B<toram>"
#. type: Plain text
-#: en/live-boot.7:135
+#: en/live-boot.7:139
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 "
@@ -731,14 +780,14 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:135
+#: en/live-boot.7:139
#, no-wrap
msgid "B<union>=aufs|unionfs"
msgstr "B<union>=aufs|unionfs"
#. FIXME
#. type: Plain text
-#: en/live-boot.7:138
+#: en/live-boot.7:142
msgid ""
"By default, live-boot uses aufs. With this parameter, you can switch to "
"unionfs."
@@ -746,32 +795,32 @@ msgstr ""
#. FIXME
#. type: SH
-#: en/live-boot.7:140
+#: en/live-boot.7:144
#, no-wrap
msgid "FILES (old)"
msgstr ""
#. type: IP
-#: en/live-boot.7:141 en/live-snapshot.1:43
+#: en/live-boot.7:145 en/live-snapshot.1:43
#, no-wrap
msgid "B</etc/live.conf>"
msgstr "B</etc/live.conf>"
#. type: Plain text
-#: en/live-boot.7:143 en/live-snapshot.1:45
+#: en/live-boot.7:147 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:147 en/live-snapshot.1:45
#, no-wrap
msgid "B<live/filesystem.module>"
msgstr "B<live/filesystem.module>"
#. type: Plain text
-#: en/live-boot.7:145 en/live-snapshot.1:47
+#: en/live-boot.7:149 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 \"/"
@@ -784,13 +833,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:145 en/live-snapshot.1:47
+#: en/live-boot.7:149 en/live-snapshot.1:47
#, no-wrap
msgid "B</etc/live-persistence.binds>"
msgstr "B</etc/live-persistence.binds>"
#. type: Plain text
-#: en/live-boot.7:147 en/live-snapshot.1:49
+#: en/live-boot.7:151 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. "
@@ -799,7 +848,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:150 en/live-snapshot.1:51
+#: en/live-boot.7:154 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 "
@@ -808,69 +857,69 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:151 en/live-snapshot.1:42
+#: en/live-boot.7:155 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr "DATEIEN"
#. type: IP
-#: en/live-boot.7:152
+#: en/live-boot.7:156
#, no-wrap
msgid "B</etc/live/boot.conf>"
msgstr "B</etc/live/boot.conf>"
#. type: IP
-#: en/live-boot.7:153
+#: en/live-boot.7:157
#, no-wrap
msgid "B</etc/live/boot.d/>"
msgstr "B</etc/live/boot.d/>"
#. type: IP
-#: en/live-boot.7:154
+#: en/live-boot.7:158
#, no-wrap
msgid "B<live/boot.conf>"
msgstr "B<live/boot.conf>"
#. type: IP
-#: en/live-boot.7:155
+#: en/live-boot.7:159
#, no-wrap
msgid "B<live/boot.d/>"
msgstr "B<live/boot.d/>"
#. type: SH
-#: en/live-boot.7:157 en/live-snapshot.1:54
+#: en/live-boot.7:161 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-boot.7:159
+#: en/live-boot.7:163
msgid "I<live-snapshot>(1)"
msgstr "I<live-snapshot>(1)"
#. type: Plain text
-#: en/live-boot.7:161 en/live-snapshot.1:58
+#: en/live-boot.7:165 en/live-snapshot.1:58
msgid "I<live-build>(7)"
msgstr "I<live-build>(7)"
#. type: Plain text
-#: en/live-boot.7:163 en/live-snapshot.1:60
+#: en/live-boot.7:167 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr "I<live-config>(7)"
#. type: Plain text
-#: en/live-boot.7:165 en/live-snapshot.1:62
+#: en/live-boot.7:169 en/live-snapshot.1:62
msgid "I<live-tools>(7)"
msgstr "I<live-tools>(7)"
#. type: SH
-#: en/live-boot.7:166 en/live-snapshot.1:63
+#: en/live-boot.7:170 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-boot.7:168 en/live-snapshot.1:65
+#: en/live-boot.7:172 en/live-snapshot.1:65
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 "
@@ -881,13 +930,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-boot.7:169 en/live-snapshot.1:66
+#: en/live-boot.7:173 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-boot.7:171 en/live-snapshot.1:68
+#: en/live-boot.7:175 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 E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -901,13 +950,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-boot.7:172 en/live-snapshot.1:69
+#: en/live-boot.7:176 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-boot.7:173 en/live-snapshot.1:70
+#: en/live-boot.7:177 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 b65f471..f8e2ff7 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: 2011-11-04 11:37+0100\n"
+"POT-Creation-Date: 2011-11-28 18:26+0100\n"
"PO-Revision-Date: 2010-05-24 12:34+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2011-11-04"
-msgstr "04.11.2011"
+msgid "2011-11-28"
+msgstr "28.11.2011"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "3.0~a22-1"
-msgstr "3.0~a22-1"
+msgid "3.0~a23-1"
+msgstr "3.0~a23-1"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
@@ -58,26 +58,26 @@ msgid "OPTIONS"
msgstr "OPTIONEN"
#. type: IP
-#: en/live-boot.7:141 en/live-snapshot.1:43
+#: en/live-boot.7:145 en/live-snapshot.1:43
#, no-wrap
msgid "B</etc/live.conf>"
msgstr "B</etc/live.conf>"
#. type: Plain text
-#: en/live-boot.7:143 en/live-snapshot.1:45
+#: en/live-boot.7:147 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:147 en/live-snapshot.1:45
#, no-wrap
msgid "B<live/filesystem.module>"
msgstr "B<live/filesystem.module>"
#. type: Plain text
-#: en/live-boot.7:145 en/live-snapshot.1:47
+#: en/live-boot.7:149 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 \"/"
@@ -90,13 +90,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:145 en/live-snapshot.1:47
+#: en/live-boot.7:149 en/live-snapshot.1:47
#, no-wrap
msgid "B</etc/live-persistence.binds>"
msgstr "B</etc/live-persistence.binds>"
#. type: Plain text
-#: en/live-boot.7:147 en/live-snapshot.1:49
+#: en/live-boot.7:151 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. "
@@ -105,7 +105,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:150 en/live-snapshot.1:51
+#: en/live-boot.7:154 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 "
@@ -114,40 +114,40 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:151 en/live-snapshot.1:42
+#: en/live-boot.7:155 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr "DATEIEN"
#. type: SH
-#: en/live-boot.7:157 en/live-snapshot.1:54
+#: en/live-boot.7:161 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-boot.7:161 en/live-snapshot.1:58
+#: en/live-boot.7:165 en/live-snapshot.1:58
msgid "I<live-build>(7)"
msgstr "I<live-build>(7)"
#. type: Plain text
-#: en/live-boot.7:163 en/live-snapshot.1:60
+#: en/live-boot.7:167 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr "I<live-config>(7)"
#. type: Plain text
-#: en/live-boot.7:165 en/live-snapshot.1:62
+#: en/live-boot.7:169 en/live-snapshot.1:62
msgid "I<live-tools>(7)"
msgstr "I<live-tools>(7)"
#. type: SH
-#: en/live-boot.7:166 en/live-snapshot.1:63
+#: en/live-boot.7:170 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-boot.7:168 en/live-snapshot.1:65
+#: en/live-boot.7:172 en/live-snapshot.1:65
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 "
@@ -158,13 +158,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-boot.7:169 en/live-snapshot.1:66
+#: en/live-boot.7:173 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-boot.7:171 en/live-snapshot.1:68
+#: en/live-boot.7:175 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 E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -178,13 +178,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-boot.7:172 en/live-snapshot.1:69
+#: en/live-boot.7:176 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-boot.7:173 en/live-snapshot.1:70
+#: en/live-boot.7:177 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-boot.7.pot b/manpages/pot/live-boot.7.pot
index dd8c1a4..877d7b2 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: 2011-11-04 11:37+0100\n"
+"POT-Creation-Date: 2011-11-28 18:26+0100\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"
@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2011-11-04"
+msgid "2011-11-28"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "3.0~a22-1"
+msgid "3.0~a23-1"
msgstr ""
#. type: TH
@@ -552,49 +552,68 @@ msgstr ""
#. type: IP
#: en/live-boot.7:109
#, no-wrap
-msgid "B<persistent>[={nofiles|cryptsetup}]"
+msgid "B<persistent>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:111
msgid ""
-"live-boot will look for persistent and snapshot partitions or files labeled "
-"\"live-rw\", \"home-rw\", and files called \"live-sn*\", \"home-sn*\" and "
-"will try to, in order: mount as /cow the first, mount the second in /home, "
-"and just copy the contents of the latter in appropriate locations "
-"(snapshots). Snapshots will be tried to be updated on reboot/shutdown. Look "
-"at live-snapshot(1) for more informations."
+"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 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\"."
+msgstr ""
+
+#. type: IP
+#: en/live-boot.7:111
+#, no-wrap
+msgid "B<persistent-encryption>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:113
msgid ""
-"If \"nofiles\" is specified, only filesystems with matching labels will be "
-"searched; no filesystems will be traversed looking for archives or image "
-"files. This results in shorter boot times."
+"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 "
+"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\"."
+msgstr ""
+
+#. type: IP
+#: en/live-boot.7:113
+#, no-wrap
+msgid "B<persistent-media>={I<removable>|I<removable-usb>}"
msgstr ""
#. type: Plain text
#: en/live-boot.7:115
msgid ""
-"If \"cryptsetup\" is specified, filesystems stored on Luks-encrypted devices "
-"will be considered as well as others when searching for a persistence "
-"filesystem; the user will be prompted for any needed decryption passphrase."
+"If you specify the keyword 'removable', live-boot will try to find "
+"persistent and snapshot partitions on removable media only. Note that if you "
+"want to further restrict the media to usb mass storage only, you can use the "
+"'removable-usb' keyword."
msgstr ""
#. type: IP
#: en/live-boot.7:115
#, no-wrap
-msgid "B<persistent-media>={I<removable>|I<removable-usb>}"
+msgid "B<persistent-method>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:117
msgid ""
-"If you specify the keyword 'removable', live-boot will try to find "
-"persistent and snapshot partitions on removable media only. Note that if you "
-"want to further restrict the media to usb mass storage only, you can use the "
-"'removable-usb' keyword."
+"This option determines which types of persistent media we allow. If \"overlay"
+"\" is in the list, we consider overlays (i.e. \"live-rw\" and \"home-rw\"); "
+"if \"snapshot\" is in the list, we consider snapshots (i.e. \"live-sn\" and "
+"\"home-sn\"). The default is \"overlay,snapshot\"."
msgstr ""
#. type: IP
@@ -614,12 +633,42 @@ msgstr ""
#. type: IP
#: en/live-boot.7:119
#, no-wrap
-msgid "B<persistent-subtext>=I<SUFFIX>"
+msgid "B<persistent-read-only>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:121
msgid ""
+"Filesystem changes are not saved back to persistent media. In particular, "
+"overlays and netboot NFS mounts are mounted read-only, and snapshots are not "
+"resynced on shutdown."
+msgstr ""
+
+#. type: IP
+#: en/live-boot.7:121
+#, no-wrap
+msgid "B<persistent-storage>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:123
+msgid ""
+"This option determines which types of persistent storage to consider when "
+"probing for persistent media. If \"filesystem\" is in the list, filesystems "
+"with matching labels will be used; if \"file\" is in the list, all "
+"filesystems will be probed for archives and image files with matching "
+"filenames. The default is \"file,filesystem\"."
+msgstr ""
+
+#. type: IP
+#: en/live-boot.7:123
+#, no-wrap
+msgid "B<persistent-subtext>=I<SUFFIX>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:125
+msgid ""
"Add a suffix when searching for the image filenames or partition labels to "
"use for the above mentioned persistent feature, the SUFFIX will be added "
"after a dash (e.g.: \"live-sn\" would transform to \"live-sn-SUFFIX\"). This "
@@ -628,26 +677,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:121
+#: en/live-boot.7:125
#, no-wrap
msgid "{B<preseed/file>|B<file>}=I<FILE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:123
+#: en/live-boot.7:127
msgid ""
"A path to a file present on the rootfs could be used to preseed debconf "
"database."
msgstr ""
#. type: IP
-#: en/live-boot.7:123
+#: en/live-boot.7:127
#, no-wrap
msgid "B<package/question>=I<VALUE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:125
+#: en/live-boot.7:129
msgid ""
"All debian installed packages could be preseeded from command-line that way, "
"beware of blanks spaces, they will interfere with parsing, use a preseed "
@@ -655,26 +704,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:125
+#: en/live-boot.7:129
#, no-wrap
msgid "B<quickreboot>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:127
+#: en/live-boot.7:131
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:131
#, no-wrap
msgid "B<showmounts>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:129
+#: en/live-boot.7:133
msgid ""
"This parameter will make live-boot to show on \"/\" the ro filesystems "
"(mostly compressed) on \"/live\". This is not enabled by default because "
@@ -683,26 +732,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:129
+#: en/live-boot.7:133
#, no-wrap
msgid "B<silent>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:131
+#: en/live-boot.7:135
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:135
#, no-wrap
msgid "B<todisk>=I<DEVICE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:133
+#: en/live-boot.7:137
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 "
@@ -712,13 +761,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:133
+#: en/live-boot.7:137
#, no-wrap
msgid "B<toram>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:135
+#: en/live-boot.7:139
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 "
@@ -726,14 +775,14 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:135
+#: en/live-boot.7:139
#, no-wrap
msgid "B<union>=aufs|unionfs"
msgstr ""
#. FIXME
#. type: Plain text
-#: en/live-boot.7:138
+#: en/live-boot.7:142
msgid ""
"By default, live-boot uses aufs. With this parameter, you can switch to "
"unionfs."
@@ -741,32 +790,32 @@ msgstr ""
#. FIXME
#. type: SH
-#: en/live-boot.7:140
+#: en/live-boot.7:144
#, no-wrap
msgid "FILES (old)"
msgstr ""
#. type: IP
-#: en/live-boot.7:141 en/live-snapshot.1:43
+#: en/live-boot.7:145 en/live-snapshot.1:43
#, no-wrap
msgid "B</etc/live.conf>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:143 en/live-snapshot.1:45
+#: en/live-boot.7:147 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:147 en/live-snapshot.1:45
#, no-wrap
msgid "B<live/filesystem.module>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:145 en/live-snapshot.1:47
+#: en/live-boot.7:149 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 \"/"
@@ -779,13 +828,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:145 en/live-snapshot.1:47
+#: en/live-boot.7:149 en/live-snapshot.1:47
#, no-wrap
msgid "B</etc/live-persistence.binds>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:147 en/live-snapshot.1:49
+#: en/live-boot.7:151 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. "
@@ -794,7 +843,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:150 en/live-snapshot.1:51
+#: en/live-boot.7:154 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 "
@@ -803,69 +852,69 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:151 en/live-snapshot.1:42
+#: en/live-boot.7:155 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/live-boot.7:152
+#: en/live-boot.7:156
#, no-wrap
msgid "B</etc/live/boot.conf>"
msgstr ""
#. type: IP
-#: en/live-boot.7:153
+#: en/live-boot.7:157
#, no-wrap
msgid "B</etc/live/boot.d/>"
msgstr ""
#. type: IP
-#: en/live-boot.7:154
+#: en/live-boot.7:158
#, no-wrap
msgid "B<live/boot.conf>"
msgstr ""
#. type: IP
-#: en/live-boot.7:155
+#: en/live-boot.7:159
#, no-wrap
msgid "B<live/boot.d/>"
msgstr ""
#. type: SH
-#: en/live-boot.7:157 en/live-snapshot.1:54
+#: en/live-boot.7:161 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:159
+#: en/live-boot.7:163
msgid "I<live-snapshot>(1)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:161 en/live-snapshot.1:58
+#: en/live-boot.7:165 en/live-snapshot.1:58
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:163 en/live-snapshot.1:60
+#: en/live-boot.7:167 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:165 en/live-snapshot.1:62
+#: en/live-boot.7:169 en/live-snapshot.1:62
msgid "I<live-tools>(7)"
msgstr ""
#. type: SH
-#: en/live-boot.7:166 en/live-snapshot.1:63
+#: en/live-boot.7:170 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:168 en/live-snapshot.1:65
+#: en/live-boot.7:172 en/live-snapshot.1:65
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 "
@@ -873,13 +922,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:169 en/live-snapshot.1:66
+#: en/live-boot.7:173 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:171 en/live-snapshot.1:68
+#: en/live-boot.7:175 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 E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -888,13 +937,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:172 en/live-snapshot.1:69
+#: en/live-boot.7:176 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:173 en/live-snapshot.1:70
+#: en/live-boot.7:177 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 e263e8e..09e1c7d 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: 2011-11-04 11:37+0100\n"
+"POT-Creation-Date: 2011-11-28 18:26+0100\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"
@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2011-11-04"
+msgid "2011-11-28"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "3.0~a22-1"
+msgid "3.0~a23-1"
msgstr ""
#. type: TH
@@ -59,26 +59,26 @@ msgid "OPTIONS"
msgstr ""
#. type: IP
-#: en/live-boot.7:141 en/live-snapshot.1:43
+#: en/live-boot.7:145 en/live-snapshot.1:43
#, no-wrap
msgid "B</etc/live.conf>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:143 en/live-snapshot.1:45
+#: en/live-boot.7:147 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:147 en/live-snapshot.1:45
#, no-wrap
msgid "B<live/filesystem.module>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:145 en/live-snapshot.1:47
+#: en/live-boot.7:149 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 \"/"
@@ -91,13 +91,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:145 en/live-snapshot.1:47
+#: en/live-boot.7:149 en/live-snapshot.1:47
#, no-wrap
msgid "B</etc/live-persistence.binds>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:147 en/live-snapshot.1:49
+#: en/live-boot.7:151 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. "
@@ -106,7 +106,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:150 en/live-snapshot.1:51
+#: en/live-boot.7:154 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 "
@@ -115,40 +115,40 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:151 en/live-snapshot.1:42
+#: en/live-boot.7:155 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr ""
#. type: SH
-#: en/live-boot.7:157 en/live-snapshot.1:54
+#: en/live-boot.7:161 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:161 en/live-snapshot.1:58
+#: en/live-boot.7:165 en/live-snapshot.1:58
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:163 en/live-snapshot.1:60
+#: en/live-boot.7:167 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:165 en/live-snapshot.1:62
+#: en/live-boot.7:169 en/live-snapshot.1:62
msgid "I<live-tools>(7)"
msgstr ""
#. type: SH
-#: en/live-boot.7:166 en/live-snapshot.1:63
+#: en/live-boot.7:170 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:168 en/live-snapshot.1:65
+#: en/live-boot.7:172 en/live-snapshot.1:65
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:169 en/live-snapshot.1:66
+#: en/live-boot.7:173 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:171 en/live-snapshot.1:68
+#: en/live-boot.7:175 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 E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -171,13 +171,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:172 en/live-snapshot.1:69
+#: en/live-boot.7:176 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:173 en/live-snapshot.1:70
+#: en/live-boot.7:177 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."
--
live-boot
More information about the debian-live-changes
mailing list