[SCM] live-boot branch, debian-next, updated. debian/3.0_a8-1-5-gb7466be
Daniel Baumann
daniel at debian.org
Tue Oct 26 07:25:04 UTC 2010
The following commit has been merged in the debian-next branch:
commit b7466bec795ac4e9fc386e0fb0ea40f37eda3881
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Oct 26 09:25:09 2010 +0200
Releasing debian version 3.0~a9-1.
diff --git a/VERSION b/VERSION
index c28f039..3d80df2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a8
+3.0~a9
diff --git a/debian/changelog b/debian/changelog
index 12df5f5..ca14d63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+live-boot (3.0~a9-1) experimental; urgency=low
+
+ [ amnesia ]
+ * Adding live-snapshot.list documentation to manpage.
+
+ [ Richard Nelson ]
+ * Removed whitespace for tabs on the skipunion option.
+
+ [ T(A)ILS developers ]
+ * Fixing overzealous blacklist usage.
+ * Adding documentation for persistent=cryptsetup in the manpage.
+
+ -- Daniel Baumann <daniel at debian.org> Tue, 26 Oct 2010 09:24:51 +0200
+
live-boot (3.0~a8-1) experimental; urgency=low
[ Michal Suchanek ]
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index c7cc05e..2173841 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 11.10.2010 3.0~a8 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 26.10.2010 3.0~a9 "Debian Live Projekt"
.SH NAME
\fBlive\-boot\fP \- System Boot Skripte
@@ -161,16 +161,21 @@ has been installed with persistent enabled.
Do not prompt to eject the CD or remove the USB flash drive on reboot.
.IP \fBswapon\fP 4
This parameter enables usage of local swap partitions.
-.IP \fBpersistent\fP[=nofiles] 4
+.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. 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.
+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\-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
diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index 2e2e60a..6d04065 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 11.10.2010 3.0~a8 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 26.10.2010 3.0~a9 "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 7ec1a47..3ff3d71 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2010\-10\-11 3.0~a8 "Debian Live Project"
+.TH LIVE\-BOOT 7 2010\-10\-26 3.0~a9 "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 aebf6f9..9b9c271 100644
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2010\-10\-11 3.0~a8 "Debian Live Project"
+.TH LIVE\-BOOT 1 2010\-10\-26 3.0~a9 "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 d6a7d91..dddbe0e 100644
--- a/manpages/po/de/live-boot.7.po
+++ b/manpages/po/de/live-boot.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 3.0~a8\n"
-"POT-Creation-Date: 2010-10-11 18:27+0300\n"
+"Project-Id-Version: live-boot 3.0~a9\n"
+"POT-Creation-Date: 2010-10-26 09:23+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"
@@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-10-11"
-msgstr "11.10.2010"
+msgid "2010-10-26"
+msgstr "26.10.2010"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "3.0~a8"
-msgstr "3.0~a8"
+msgid "3.0~a9"
+msgstr "3.0~a9"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
@@ -522,8 +522,8 @@ msgstr ""
#. type: IP
#: en/live-boot.7:103
#, no-wrap
-msgid "B<persistent>[=nofiles]"
-msgstr "B<persistent>[=nofiles]"
+msgid "B<persistent>[={nofiles|cryptsetup}]"
+msgstr ""
#. type: Plain text
#: en/live-boot.7:105
@@ -533,20 +533,33 @@ msgid ""
"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. 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."
+"at live-snapshot(1) for more informations."
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:107
+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."
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:109
+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."
msgstr ""
#. type: IP
-#: en/live-boot.7:105
+#: en/live-boot.7:109
#, no-wrap
msgid "B<persistent-path>=I<PATH>"
msgstr "B<persistent-path>=I<PATH>"
#. type: Plain text
-#: en/live-boot.7:107
+#: en/live-boot.7:111
msgid ""
"live-boot will look for persistency files in the root directory of a "
"partition, with this parameter, the path can be configured so that you can "
@@ -554,13 +567,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:107
+#: en/live-boot.7:111
#, no-wrap
msgid "B<persistent-subtext>=I<SUFFIX>"
msgstr "B<persistent-subtext>=I<SUFFIX>"
#. type: Plain text
-#: en/live-boot.7:109
+#: en/live-boot.7:113
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 "
@@ -570,26 +583,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:109
+#: en/live-boot.7:113
#, 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:111
+#: en/live-boot.7:115
msgid ""
"A path to a file present on the rootfs could be used to preseed debconf "
"database."
msgstr ""
#. type: IP
-#: en/live-boot.7:111
+#: en/live-boot.7:115
#, no-wrap
msgid "B<package/question>=I<VALUE>"
msgstr "B<package/question>=I<VALUE>"
#. type: Plain text
-#: en/live-boot.7:113
+#: en/live-boot.7:117
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 "
@@ -597,26 +610,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:113
+#: en/live-boot.7:117
#, no-wrap
msgid "B<quickreboot>"
msgstr "B<quickreboot>"
#. type: Plain text
-#: en/live-boot.7:115
+#: en/live-boot.7:119
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:115
+#: en/live-boot.7:119
#, no-wrap
msgid "B<showmounts>"
msgstr "B<showmounts>"
#. type: Plain text
-#: en/live-boot.7:117
+#: en/live-boot.7:121
msgid ""
"This parameter will make live-boot to show on \"/\" the ro filesystems "
"(mostly compressed) on \"/live\". This is not enabled by default because "
@@ -625,26 +638,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:117
+#: en/live-boot.7:121
#, no-wrap
msgid "B<silent>"
msgstr "B<silent>"
#. type: Plain text
-#: en/live-boot.7:119
+#: en/live-boot.7:123
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:119
+#: en/live-boot.7:123
#, no-wrap
msgid "B<todisk>=I<DEVICE>"
msgstr "B<todisk>=I<DEVICE>"
#. type: Plain text
-#: en/live-boot.7:121
+#: en/live-boot.7:125
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 "
@@ -654,13 +667,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:121
+#: en/live-boot.7:125
#, no-wrap
msgid "B<toram>"
msgstr "B<toram>"
#. type: Plain text
-#: en/live-boot.7:123
+#: en/live-boot.7:127
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 "
@@ -668,14 +681,14 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:123
+#: en/live-boot.7:127
#, no-wrap
msgid "B<union>=aufs|unionfs"
msgstr "B<union>=aufs|unionfs"
#. FIXME
#. type: Plain text
-#: en/live-boot.7:126
+#: en/live-boot.7:130
msgid ""
"By default, live-boot uses aufs. With this parameter, you can switch to "
"unionfs."
@@ -683,32 +696,32 @@ msgstr ""
#. FIXME
#. type: SH
-#: en/live-boot.7:128
+#: en/live-boot.7:132
#, no-wrap
msgid "FILES (old)"
msgstr ""
#. type: IP
-#: en/live-boot.7:129 en/live-snapshot.1:43
+#: en/live-boot.7:133 en/live-snapshot.1:43
#, no-wrap
msgid "B</etc/live.conf>"
msgstr "B</etc/live.conf>"
#. type: Plain text
-#: en/live-boot.7:131 en/live-snapshot.1:45
+#: en/live-boot.7:135 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:131 en/live-snapshot.1:45
+#: en/live-boot.7:135 en/live-snapshot.1:45
#, no-wrap
msgid "B<live/filesystem.module>"
msgstr "B<live/filesystem.module>"
#. type: Plain text
-#: en/live-boot.7:133 en/live-snapshot.1:47
+#: en/live-boot.7:137 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 \"/"
@@ -721,13 +734,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:133 en/live-snapshot.1:47
+#: en/live-boot.7:137 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:135 en/live-snapshot.1:49
+#: en/live-boot.7:139 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. "
@@ -736,7 +749,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:138 en/live-snapshot.1:51
+#: en/live-boot.7:142 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 "
@@ -745,69 +758,69 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:139 en/live-snapshot.1:42
+#: en/live-boot.7:143 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr "DATEIEN"
#. type: IP
-#: en/live-boot.7:140
+#: en/live-boot.7:144
#, no-wrap
msgid "B</etc/live/boot.conf>"
msgstr "B</etc/live/boot.conf>"
#. type: IP
-#: en/live-boot.7:141
+#: en/live-boot.7:145
#, no-wrap
msgid "B</etc/live/boot.d/>"
msgstr "B</etc/live/boot.d/>"
#. type: IP
-#: en/live-boot.7:142
+#: en/live-boot.7:146
#, no-wrap
msgid "B<live/boot.conf>"
msgstr "B<live/boot.conf>"
#. type: IP
-#: en/live-boot.7:143
+#: en/live-boot.7:147
#, no-wrap
msgid "B<live/boot.d/>"
msgstr "B<live/boot.d/>"
#. type: SH
-#: en/live-boot.7:145 en/live-snapshot.1:54
+#: en/live-boot.7:149 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-boot.7:147
+#: en/live-boot.7:151
msgid "I<live-snapshot>(1)"
msgstr "I<live-snapshot>(1)"
#. type: Plain text
-#: en/live-boot.7:149 en/live-snapshot.1:58
+#: en/live-boot.7:153 en/live-snapshot.1:58
msgid "I<live-build>(7)"
msgstr "I<live-build>(7)"
#. type: Plain text
-#: en/live-boot.7:151 en/live-snapshot.1:60
+#: en/live-boot.7:155 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr "I<live-config>(7)"
#. type: Plain text
-#: en/live-boot.7:153 en/live-snapshot.1:62
+#: en/live-boot.7:157 en/live-snapshot.1:62
msgid "I<live-tools>(7)"
msgstr "I<live-tools>(7)"
#. type: SH
-#: en/live-boot.7:154 en/live-snapshot.1:63
+#: en/live-boot.7:158 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-boot.7:156 en/live-snapshot.1:65
+#: en/live-boot.7:160 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 "
@@ -818,13 +831,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-boot.7:157 en/live-snapshot.1:66
+#: en/live-boot.7:161 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-boot.7:159 en/live-snapshot.1:68
+#: en/live-boot.7:163 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 "
@@ -838,13 +851,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-boot.7:160 en/live-snapshot.1:69
+#: en/live-boot.7:164 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-boot.7:161 en/live-snapshot.1:70
+#: en/live-boot.7:165 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 ee21676..3a8f0ef 100644
--- a/manpages/po/de/live-snapshot.1.po
+++ b/manpages/po/de/live-snapshot.1.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 3.0~a8\n"
-"POT-Creation-Date: 2010-10-11 18:27+0300\n"
+"Project-Id-Version: live-boot 3.0~a9\n"
+"POT-Creation-Date: 2010-10-26 09:23+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"
@@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-10-11"
-msgstr "11.10.2010"
+msgid "2010-10-26"
+msgstr "26.10.2010"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "3.0~a8"
-msgstr "3.0~a8"
+msgid "3.0~a9"
+msgstr "3.0~a9"
#. 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:129 en/live-snapshot.1:43
+#: en/live-boot.7:133 en/live-snapshot.1:43
#, no-wrap
msgid "B</etc/live.conf>"
msgstr "B</etc/live.conf>"
#. type: Plain text
-#: en/live-boot.7:131 en/live-snapshot.1:45
+#: en/live-boot.7:135 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:131 en/live-snapshot.1:45
+#: en/live-boot.7:135 en/live-snapshot.1:45
#, no-wrap
msgid "B<live/filesystem.module>"
msgstr "B<live/filesystem.module>"
#. type: Plain text
-#: en/live-boot.7:133 en/live-snapshot.1:47
+#: en/live-boot.7:137 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:133 en/live-snapshot.1:47
+#: en/live-boot.7:137 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:135 en/live-snapshot.1:49
+#: en/live-boot.7:139 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:138 en/live-snapshot.1:51
+#: en/live-boot.7:142 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:139 en/live-snapshot.1:42
+#: en/live-boot.7:143 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr "DATEIEN"
#. type: SH
-#: en/live-boot.7:145 en/live-snapshot.1:54
+#: en/live-boot.7:149 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-boot.7:149 en/live-snapshot.1:58
+#: en/live-boot.7:153 en/live-snapshot.1:58
msgid "I<live-build>(7)"
msgstr "I<live-build>(7)"
#. type: Plain text
-#: en/live-boot.7:151 en/live-snapshot.1:60
+#: en/live-boot.7:155 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr "I<live-config>(7)"
#. type: Plain text
-#: en/live-boot.7:153 en/live-snapshot.1:62
+#: en/live-boot.7:157 en/live-snapshot.1:62
msgid "I<live-tools>(7)"
msgstr "I<live-tools>(7)"
#. type: SH
-#: en/live-boot.7:154 en/live-snapshot.1:63
+#: en/live-boot.7:158 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-boot.7:156 en/live-snapshot.1:65
+#: en/live-boot.7:160 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:157 en/live-snapshot.1:66
+#: en/live-boot.7:161 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-boot.7:159 en/live-snapshot.1:68
+#: en/live-boot.7:163 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:160 en/live-snapshot.1:69
+#: en/live-boot.7:164 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-boot.7:161 en/live-snapshot.1:70
+#: en/live-boot.7:165 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 0666227..5fa9e63 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: 2010-10-11 18:27+0300\n"
+"POT-Creation-Date: 2010-10-26 09:23+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"
@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-10-11"
+msgid "2010-10-26"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "3.0~a8"
+msgid "3.0~a9"
msgstr ""
#. type: TH
@@ -517,7 +517,7 @@ msgstr ""
#. type: IP
#: en/live-boot.7:103
#, no-wrap
-msgid "B<persistent>[=nofiles]"
+msgid "B<persistent>[={nofiles|cryptsetup}]"
msgstr ""
#. type: Plain text
@@ -528,20 +528,33 @@ msgid ""
"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. 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."
+"at live-snapshot(1) for more informations."
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:107
+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."
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:109
+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."
msgstr ""
#. type: IP
-#: en/live-boot.7:105
+#: en/live-boot.7:109
#, no-wrap
msgid "B<persistent-path>=I<PATH>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:107
+#: en/live-boot.7:111
msgid ""
"live-boot will look for persistency files in the root directory of a "
"partition, with this parameter, the path can be configured so that you can "
@@ -549,13 +562,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:107
+#: en/live-boot.7:111
#, no-wrap
msgid "B<persistent-subtext>=I<SUFFIX>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:109
+#: en/live-boot.7:113
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 "
@@ -565,26 +578,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:109
+#: en/live-boot.7:113
#, no-wrap
msgid "{B<preseed/file>|B<file>}=I<FILE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:111
+#: en/live-boot.7:115
msgid ""
"A path to a file present on the rootfs could be used to preseed debconf "
"database."
msgstr ""
#. type: IP
-#: en/live-boot.7:111
+#: en/live-boot.7:115
#, no-wrap
msgid "B<package/question>=I<VALUE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:113
+#: en/live-boot.7:117
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 "
@@ -592,26 +605,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:113
+#: en/live-boot.7:117
#, no-wrap
msgid "B<quickreboot>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:115
+#: en/live-boot.7:119
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:115
+#: en/live-boot.7:119
#, no-wrap
msgid "B<showmounts>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:117
+#: en/live-boot.7:121
msgid ""
"This parameter will make live-boot to show on \"/\" the ro filesystems "
"(mostly compressed) on \"/live\". This is not enabled by default because "
@@ -620,26 +633,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:117
+#: en/live-boot.7:121
#, no-wrap
msgid "B<silent>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:119
+#: en/live-boot.7:123
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:119
+#: en/live-boot.7:123
#, no-wrap
msgid "B<todisk>=I<DEVICE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:121
+#: en/live-boot.7:125
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 "
@@ -649,13 +662,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:121
+#: en/live-boot.7:125
#, no-wrap
msgid "B<toram>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:123
+#: en/live-boot.7:127
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 "
@@ -663,14 +676,14 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:123
+#: en/live-boot.7:127
#, no-wrap
msgid "B<union>=aufs|unionfs"
msgstr ""
#. FIXME
#. type: Plain text
-#: en/live-boot.7:126
+#: en/live-boot.7:130
msgid ""
"By default, live-boot uses aufs. With this parameter, you can switch to "
"unionfs."
@@ -678,32 +691,32 @@ msgstr ""
#. FIXME
#. type: SH
-#: en/live-boot.7:128
+#: en/live-boot.7:132
#, no-wrap
msgid "FILES (old)"
msgstr ""
#. type: IP
-#: en/live-boot.7:129 en/live-snapshot.1:43
+#: en/live-boot.7:133 en/live-snapshot.1:43
#, no-wrap
msgid "B</etc/live.conf>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:131 en/live-snapshot.1:45
+#: en/live-boot.7:135 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:131 en/live-snapshot.1:45
+#: en/live-boot.7:135 en/live-snapshot.1:45
#, no-wrap
msgid "B<live/filesystem.module>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:133 en/live-snapshot.1:47
+#: en/live-boot.7:137 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 \"/"
@@ -716,13 +729,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:133 en/live-snapshot.1:47
+#: en/live-boot.7:137 en/live-snapshot.1:47
#, no-wrap
msgid "B</etc/live-persistence.binds>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:135 en/live-snapshot.1:49
+#: en/live-boot.7:139 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. "
@@ -731,7 +744,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:138 en/live-snapshot.1:51
+#: en/live-boot.7:142 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 "
@@ -740,69 +753,69 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:139 en/live-snapshot.1:42
+#: en/live-boot.7:143 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/live-boot.7:140
+#: en/live-boot.7:144
#, no-wrap
msgid "B</etc/live/boot.conf>"
msgstr ""
#. type: IP
-#: en/live-boot.7:141
+#: en/live-boot.7:145
#, no-wrap
msgid "B</etc/live/boot.d/>"
msgstr ""
#. type: IP
-#: en/live-boot.7:142
+#: en/live-boot.7:146
#, no-wrap
msgid "B<live/boot.conf>"
msgstr ""
#. type: IP
-#: en/live-boot.7:143
+#: en/live-boot.7:147
#, no-wrap
msgid "B<live/boot.d/>"
msgstr ""
#. type: SH
-#: en/live-boot.7:145 en/live-snapshot.1:54
+#: en/live-boot.7:149 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:147
+#: en/live-boot.7:151
msgid "I<live-snapshot>(1)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:149 en/live-snapshot.1:58
+#: en/live-boot.7:153 en/live-snapshot.1:58
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:151 en/live-snapshot.1:60
+#: en/live-boot.7:155 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:153 en/live-snapshot.1:62
+#: en/live-boot.7:157 en/live-snapshot.1:62
msgid "I<live-tools>(7)"
msgstr ""
#. type: SH
-#: en/live-boot.7:154 en/live-snapshot.1:63
+#: en/live-boot.7:158 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:156 en/live-snapshot.1:65
+#: en/live-boot.7:160 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 "
@@ -810,13 +823,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:157 en/live-snapshot.1:66
+#: en/live-boot.7:161 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:159 en/live-snapshot.1:68
+#: en/live-boot.7:163 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 "
@@ -825,13 +838,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:160 en/live-snapshot.1:69
+#: en/live-boot.7:164 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:161 en/live-snapshot.1:70
+#: en/live-boot.7:165 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 c52093a..dc2e3bf 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: 2010-10-11 18:27+0300\n"
+"POT-Creation-Date: 2010-10-26 09:23+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"
@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-10-11"
+msgid "2010-10-26"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "3.0~a8"
+msgid "3.0~a9"
msgstr ""
#. type: TH
@@ -59,26 +59,26 @@ msgid "OPTIONS"
msgstr ""
#. type: IP
-#: en/live-boot.7:129 en/live-snapshot.1:43
+#: en/live-boot.7:133 en/live-snapshot.1:43
#, no-wrap
msgid "B</etc/live.conf>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:131 en/live-snapshot.1:45
+#: en/live-boot.7:135 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:131 en/live-snapshot.1:45
+#: en/live-boot.7:135 en/live-snapshot.1:45
#, no-wrap
msgid "B<live/filesystem.module>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:133 en/live-snapshot.1:47
+#: en/live-boot.7:137 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:133 en/live-snapshot.1:47
+#: en/live-boot.7:137 en/live-snapshot.1:47
#, no-wrap
msgid "B</etc/live-persistence.binds>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:135 en/live-snapshot.1:49
+#: en/live-boot.7:139 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:138 en/live-snapshot.1:51
+#: en/live-boot.7:142 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:139 en/live-snapshot.1:42
+#: en/live-boot.7:143 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr ""
#. type: SH
-#: en/live-boot.7:145 en/live-snapshot.1:54
+#: en/live-boot.7:149 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:149 en/live-snapshot.1:58
+#: en/live-boot.7:153 en/live-snapshot.1:58
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:151 en/live-snapshot.1:60
+#: en/live-boot.7:155 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:153 en/live-snapshot.1:62
+#: en/live-boot.7:157 en/live-snapshot.1:62
msgid "I<live-tools>(7)"
msgstr ""
#. type: SH
-#: en/live-boot.7:154 en/live-snapshot.1:63
+#: en/live-boot.7:158 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:156 en/live-snapshot.1:65
+#: en/live-boot.7:160 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:157 en/live-snapshot.1:66
+#: en/live-boot.7:161 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:159 en/live-snapshot.1:68
+#: en/live-boot.7:163 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:160 en/live-snapshot.1:69
+#: en/live-boot.7:164 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:161 en/live-snapshot.1:70
+#: en/live-boot.7:165 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