[SCM] live-boot branch, debian-next, updated. debian/3.0_a8-1-1-g82b452c
Daniel Baumann
daniel at debian.org
Mon Oct 11 16:28:16 UTC 2010
The following commit has been merged in the debian-next branch:
commit 82b452c32355925efb50e8eca600f31db283b190
Author: amnesia <amnesia at boum.org>
Date: Mon Oct 11 16:52:56 2010 +0200
Adding live-snapshot.list documentation to manpage.
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 5652ef8..c7cc05e 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 02.10.2010 3.0~a8 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 11.10.2010 3.0~a8 "Debian Live Projekt"
.SH NAME
\fBlive\-boot\fP \- System Boot Skripte
diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index c972de4..2e2e60a 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 02.10.2010 3.0~a8 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 11.10.2010 3.0~a8 "Debian Live Projekt"
.SH NAME
\fBlive\-snapshot\fP \- simple script to ease persistence usage
@@ -83,6 +83,11 @@ 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
regenerated each time. This is achieved by bind mounting each listed
directory with a tmpfs on the original path.
+.IP \fB/etc/live\-snapshot.list\fP 4
+This optional file, if present changes the behaviour of live\-snapshot: only
+files and directories listed there are included (integrally) in the
+snapshot. Beware, it is an experimental feature that only works for cpio
+targets now.
.SH "SIEHE AUCH"
\fIlive\-boot\fP(1)
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 2f2fec3..e737623 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2010\-10\-02 3.0~a8 "Debian Live Project"
+.TH LIVE\-BOOT 7 2010\-10\-11 3.0~a8 "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 1a56a5c..aebf6f9 100644
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2010\-10\-02 3.0~a8 "Debian Live Project"
+.TH LIVE\-BOOT 1 2010\-10\-11 3.0~a8 "Debian Live Project"
.SH NAME
\fBlive\-snapshot\fR \- simple script to ease persistence usage
@@ -48,6 +48,8 @@ This optional file (inside the live media) contains a list of white\-space or ca
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. their content does not need to survive reboots when using the persistence features.
.br
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 regenerated each time. This is achieved by bind mounting each listed directory with a tmpfs on the original path.
+.IP "\fB/etc/live\-snapshot.list\fR" 4
+This optional file, if present changes the behaviour of live\-snapshot: only files and directories listed there are included (integrally) in the snapshot. Beware, it is an experimental feature that only works for cpio targets now.
.SH SEE ALSO
\fIlive\-boot\fR(1)
diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index e979f7b..d6a7d91 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~a8\n"
-"POT-Creation-Date: 2010-10-02 10:16+0300\n"
+"POT-Creation-Date: 2010-10-11 18:27+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,8 +24,8 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-10-02"
-msgstr "02.10.2010"
+msgid "2010-10-11"
+msgstr "11.10.2010"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
@@ -775,7 +775,7 @@ msgid "B<live/boot.d/>"
msgstr "B<live/boot.d/>"
#. type: SH
-#: en/live-boot.7:145 en/live-snapshot.1:52
+#: en/live-boot.7:145 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
@@ -786,28 +786,28 @@ msgid "I<live-snapshot>(1)"
msgstr "I<live-snapshot>(1)"
#. type: Plain text
-#: en/live-boot.7:149 en/live-snapshot.1:56
+#: en/live-boot.7:149 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:58
+#: en/live-boot.7:151 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:60
+#: en/live-boot.7:153 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:61
+#: en/live-boot.7:154 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-boot.7:156 en/live-snapshot.1:63
+#: en/live-boot.7:156 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 +818,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:64
+#: en/live-boot.7:157 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-boot.7:159 en/live-snapshot.1:66
+#: en/live-boot.7:159 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 +838,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-boot.7:160 en/live-snapshot.1:67
+#: en/live-boot.7:160 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-boot.7:161 en/live-snapshot.1:68
+#: en/live-boot.7:161 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 ff03f10..ee21676 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~a8\n"
-"POT-Creation-Date: 2010-10-02 10:16+0300\n"
+"POT-Creation-Date: 2010-10-11 18:27+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,8 +24,8 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-10-02"
-msgstr "02.10.2010"
+msgid "2010-10-11"
+msgstr "11.10.2010"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
@@ -120,34 +120,34 @@ msgid "FILES"
msgstr "DATEIEN"
#. type: SH
-#: en/live-boot.7:145 en/live-snapshot.1:52
+#: en/live-boot.7:145 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:56
+#: en/live-boot.7:149 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:58
+#: en/live-boot.7:151 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:60
+#: en/live-boot.7:153 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:61
+#: en/live-boot.7:154 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-boot.7:156 en/live-snapshot.1:63
+#: en/live-boot.7:156 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:64
+#: en/live-boot.7:157 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-boot.7:159 en/live-snapshot.1:66
+#: en/live-boot.7:159 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:67
+#: en/live-boot.7:160 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-boot.7:161 en/live-snapshot.1:68
+#: en/live-boot.7:161 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."
@@ -370,7 +370,22 @@ msgstr "-v, --version"
msgid "output version information and exit."
msgstr ""
+#. type: IP
+#: en/live-snapshot.1:51
+#, no-wrap
+msgid "B</etc/live-snapshot.list>"
+msgstr "B</etc/live-snapshot.list>"
+
+#. type: Plain text
+#: en/live-snapshot.1:53
+msgid ""
+"This optional file, if present changes the behaviour of live-snapshot: only "
+"files and directories listed there are included (integrally) in the "
+"snapshot. Beware, it is an experimental feature that only works for cpio "
+"targets now."
+msgstr ""
+
#. type: Plain text
-#: en/live-snapshot.1:54
+#: en/live-snapshot.1:56
msgid "I<live-boot>(1)"
msgstr "I<live-boot>(1)"
diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 8b00b43..0666227 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-02 10:16+0300\n"
+"POT-Creation-Date: 2010-10-11 18:27+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,7 +25,7 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-10-02"
+msgid "2010-10-11"
msgstr ""
#. type: TH
@@ -770,7 +770,7 @@ msgid "B<live/boot.d/>"
msgstr ""
#. type: SH
-#: en/live-boot.7:145 en/live-snapshot.1:52
+#: en/live-boot.7:145 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr ""
@@ -781,28 +781,28 @@ msgid "I<live-snapshot>(1)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:149 en/live-snapshot.1:56
+#: en/live-boot.7:149 en/live-snapshot.1:58
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:151 en/live-snapshot.1:58
+#: en/live-boot.7:151 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:153 en/live-snapshot.1:60
+#: en/live-boot.7:153 en/live-snapshot.1:62
msgid "I<live-tools>(7)"
msgstr ""
#. type: SH
-#: en/live-boot.7:154 en/live-snapshot.1:61
+#: en/live-boot.7:154 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:156 en/live-snapshot.1:63
+#: en/live-boot.7:156 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 +810,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:157 en/live-snapshot.1:64
+#: en/live-boot.7:157 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:159 en/live-snapshot.1:66
+#: en/live-boot.7:159 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 +825,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:160 en/live-snapshot.1:67
+#: en/live-boot.7:160 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:161 en/live-snapshot.1:68
+#: en/live-boot.7:161 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 e61e534..c52093a 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-02 10:16+0300\n"
+"POT-Creation-Date: 2010-10-11 18:27+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,7 +25,7 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-10-02"
+msgid "2010-10-11"
msgstr ""
#. type: TH
@@ -121,34 +121,34 @@ msgid "FILES"
msgstr ""
#. type: SH
-#: en/live-boot.7:145 en/live-snapshot.1:52
+#: en/live-boot.7:145 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:149 en/live-snapshot.1:56
+#: en/live-boot.7:149 en/live-snapshot.1:58
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:151 en/live-snapshot.1:58
+#: en/live-boot.7:151 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:153 en/live-snapshot.1:60
+#: en/live-boot.7:153 en/live-snapshot.1:62
msgid "I<live-tools>(7)"
msgstr ""
#. type: SH
-#: en/live-boot.7:154 en/live-snapshot.1:61
+#: en/live-boot.7:154 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:156 en/live-snapshot.1:63
+#: en/live-boot.7:156 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:64
+#: en/live-boot.7:157 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:159 en/live-snapshot.1:66
+#: en/live-boot.7:159 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:67
+#: en/live-boot.7:160 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:161 en/live-snapshot.1:68
+#: en/live-boot.7:161 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."
@@ -359,7 +359,22 @@ msgstr ""
msgid "output version information and exit."
msgstr ""
+#. type: IP
+#: en/live-snapshot.1:51
+#, no-wrap
+msgid "B</etc/live-snapshot.list>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-snapshot.1:53
+msgid ""
+"This optional file, if present changes the behaviour of live-snapshot: only "
+"files and directories listed there are included (integrally) in the "
+"snapshot. Beware, it is an experimental feature that only works for cpio "
+"targets now."
+msgstr ""
+
#. type: Plain text
-#: en/live-snapshot.1:54
+#: en/live-snapshot.1:56
msgid "I<live-boot>(1)"
msgstr ""
--
live-boot
More information about the debian-live-changes
mailing list