[SCM] live-boot branch, upstream, updated. upstream/2.0_a12-1-ge0f8a3e
Daniel Baumann
daniel at debian.org
Thu Jul 15 17:33:21 UTC 2010
The following commit has been merged in the upstream branch:
commit e0f8a3e9b2224c661d53c19948974279dc9d1c07
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Jul 15 19:32:07 2010 +0200
Adding upstream version 2.0~a13.
diff --git a/Makefile b/Makefile
index 85b4b84..b24d4f8 100644
--- a/Makefile
+++ b/Makefile
@@ -19,19 +19,24 @@ test:
@echo " done."
+ @if [ ! -x "$$(which checkbashisms 2>/dev/null)" ]; \
+ then \
+ echo "W: checkbashisms - command not found"; \
+ echo "I: checkbashisms can be optained from: "; \
+ echo "I: http://git.debian.org/?p=devscripts/devscripts.git"; \
+ echo "I: On Debian systems, checkbashisms can be installed with:"; \
+ echo "I: apt-get install devscripts"; \
+ exit 0; \
+ fi
+
@echo -n "Checking for bashisms"
@# We can't just fail yet on bashisms (FIXME)
- @if [ -x /usr/bin/checkbashisms ]; \
- then \
- for SCRIPT in $(SCRIPTS); \
- do \
- checkbashisms -f -x $${SCRIPT} || true; \
- echo -n "."; \
- done; \
- else \
- echo "WARNING: skipping bashism test - you need to install devscripts."; \
- fi
+ @for SCRIPT in $(SCRIPTS); \
+ do \
+ checkbashisms -f -x $${SCRIPT} || true; \
+ echo -n "."; \
+ done
@echo " done."
diff --git a/VERSION b/VERSION
index 41bc97f..eddafe4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0~a12
+2.0~a13
diff --git a/manpages/Makefile b/manpages/Makefile
index 55f27fb..444468a 100644
--- a/manpages/Makefile
+++ b/manpages/Makefile
@@ -23,18 +23,19 @@ build: po4a.cfg
@if [ ! -x "$$(which po4a 2>/dev/null)" ]; \
then \
echo "E: po4a - command not found"; \
- echo "I: po4a can be optained from http://po4a.alioth.debian.org/"; \
- echo "I: On Debian systems, po4a can be installed with 'apt-get install po4a'."; \
+ echo "I: po4a can be optained from:"; \
+ echo "I: http://po4a.alioth.debian.org/"; \
+ echo "I: On Debian systems, po4a can be installed with:"; \
+ echo "I: apt-get install po4a"; \
exit 1; \
fi
po4a --keep 0 --no-backups --package-name live-boot po4a.cfg
clean:
- rm -f po/*/*.po~
+ rm -rf $(LANGUAGES)
distclean: clean
rm -f po4a.cfg
- rm -rf $(LANGUAGES)
rebuild: distclean update build
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index afb7677..77c95fb 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 07.07.2010 2.0~a12 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 15.07.2010 2.0~a13 "Debian Live Projekt"
.SH NAME
\fBlive\-boot\fP \- System Boot Skripte
@@ -92,6 +92,9 @@ Target <target\-name>
Lun 0 Path=<path\-to\-your\-live\-image.iso>,Type=fileio,IOMode=ro
# If you want to boot multiple machines you might want to look at tuning some parameters like
# Wthreads or MaxConnections
+.IP \fBfromiso\fP=\fI/PATH/TO/IMAGE\fP 4
+Allows to use a filesystem from within an iso image that's available on
+live\-media.
.IP \fBignore_uuid\fP 4
Do not check that any UUID embedded in the initramfs matches the discovered
medium. live\-boot may be told to generate a UUID by setting
diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index 320a853..a2c6aed 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 07.07.2010 2.0~a12 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 15.07.2010 2.0~a13 "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 2d52382..91b037c 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2010\-07\-07 2.0~a12 "Debian Live Project"
+.TH LIVE\-BOOT 7 2010\-07\-15 2.0~a13 "Debian Live Project"
.SH NAME
\fBlive\-boot\fR \- System Boot Scripts
@@ -64,6 +64,8 @@ Target <target-name>
Lun 0 Path=<path-to-your-live-image.iso>,Type=fileio,IOMode=ro
# If you want to boot multiple machines you might want to look at tuning some parameters like
# Wthreads or MaxConnections
+.IP "\fBfromiso\fR=\fI/PATH/TO/IMAGE\fI" 4
+Allows to use a filesystem from within an iso image that's available on live-media.
.IP "\fBignore_uuid\fR" 4
Do not check that any UUID embedded in the initramfs matches the discovered medium. live\-boot may be told to generate a UUID by setting LIVE_GENERATE_UUID=1 when building the initramfs.
.IP "\fBintegrity\-check\fR" 4
diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1
index d0704eb..fd25873 100644
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2010\-07\-07 2.0~a12 "Debian Live Project"
+.TH LIVE\-BOOT 1 2010\-07\-15 2.0~a13 "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 09fe887..a7ae789 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 2.0~a12\n"
-"POT-Creation-Date: 2010-07-07 20:12+0300\n"
+"Project-Id-Version: live-boot 2.0~a13\n"
+"POT-Creation-Date: 2010-07-15 19:29+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-07-07"
-msgstr "07.07.2010"
+msgid "2010-07-15"
+msgstr "15.07.2010"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0~a12"
-msgstr "2.0~a12"
+msgid "2.0~a13"
+msgstr "2.0~a13"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
@@ -283,11 +283,24 @@ msgstr ""
#. type: IP
#: en/live-boot.7:67
#, no-wrap
+msgid "B<fromiso>=I</PATH/TO/IMAGE>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:69
+msgid ""
+"Allows to use a filesystem from within an iso image that's available on live-"
+"media."
+msgstr ""
+
+#. type: IP
+#: en/live-boot.7:69
+#, no-wrap
msgid "B<ignore_uuid>"
msgstr "B<ignore_uuid>"
#. type: Plain text
-#: en/live-boot.7:69
+#: en/live-boot.7:71
msgid ""
"Do not check that any UUID embedded in the initramfs matches the discovered "
"medium. live-boot may be told to generate a UUID by setting "
@@ -295,13 +308,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:69
+#: en/live-boot.7:71
#, no-wrap
msgid "B<integrity-check>"
msgstr "B<integrity-check>"
#. type: Plain text
-#: en/live-boot.7:71
+#: en/live-boot.7:73
msgid ""
"If specified, an MD5 sum is calculated on the live media during boot and "
"compared to the value found in md5sum.txt found in the root directory of the "
@@ -309,13 +322,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:71
+#: en/live-boot.7:73
#, no-wrap
msgid "B<ip>=[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<DEVICE>]:[I<AUTOCONF>] [,[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<DEVICE>]:[I<AUTOCONF>]]"
msgstr "B<ip>=[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<DEVICE>]:[I<AUTOCONF>] [,[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<DEVICE>]:[I<AUTOCONF>]]"
#. type: Plain text
-#: en/live-boot.7:73
+#: en/live-boot.7:75
msgid ""
"Let you specify the name(s) and the options of the interface(s) that should "
"be configured at boot time. Do not specify this if you want to use dhcp "
@@ -325,13 +338,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:73
+#: en/live-boot.7:75
#, no-wrap
msgid "B<ip>=[I<frommedia>]"
msgstr "B<ip>=[I<frommedia>]"
#. type: Plain text
-#: en/live-boot.7:75
+#: en/live-boot.7:77
msgid ""
"If this variable is set, dhcp and static configuration are just skipped and "
"the system will use the (must be) media-preconfigured /etc/network/"
@@ -339,13 +352,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:75
+#: en/live-boot.7:77
#, no-wrap
msgid "{B<live-media>|B<bootfrom>}=I<DEVICE>"
msgstr "{B<live-media>|B<bootfrom>}=I<DEVICE>"
#. type: Plain text
-#: en/live-boot.7:77
+#: en/live-boot.7:79
msgid ""
"If you specify one of this two equivalent forms, live-boot will first try to "
"find this device for the \"/live\" directory where the read-only root "
@@ -354,7 +367,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:79
+#: en/live-boot.7:81
msgid ""
"Instead of specifing an actual device name, the keyword 'removable' can be "
"used to limit the search of acceptable live media to removable type only. "
@@ -363,13 +376,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:79
+#: en/live-boot.7:81
#, no-wrap
msgid "{B<live-media-encryption>|B<encryption>}=I<TYPE>"
msgstr "{B<live-media-encryption>|B<encryption>}=I<TYPE>"
#. type: Plain text
-#: en/live-boot.7:81
+#: en/live-boot.7:83
msgid ""
"live-boot will mount the encrypted rootfs TYPE, asking the passphrase, "
"useful to build paranoid live systems :-). TYPE supported so far are \"aes\" "
@@ -377,13 +390,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:81
+#: en/live-boot.7:83
#, no-wrap
msgid "B<live-media-offset>=I<BYTES>"
msgstr "B<live-media-offset>=I<BYTES>"
#. type: Plain text
-#: en/live-boot.7:83
+#: en/live-boot.7:85
msgid ""
"This way you could tell live-boot that your image starts at offset BYTES in "
"the above specified or autodiscovered device, this could be useful to hide "
@@ -392,13 +405,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:83
+#: en/live-boot.7:85
#, no-wrap
msgid "B<live-media-path>=I<PATH>"
msgstr "B<live-media-path>=I<PATH>"
#. type: Plain text
-#: en/live-boot.7:85
+#: en/live-boot.7:87
msgid ""
"Sets the path to the live filesystem on the medium. By default, it is set to "
"'/live' and you should not change that unless you have customized your media "
@@ -406,26 +419,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:85
+#: en/live-boot.7:87
#, no-wrap
msgid "B<live-media-timeout>=I<SECONDS>"
msgstr "B<live-media-timeout>=I<SECONDS>"
#. type: Plain text
-#: en/live-boot.7:87
+#: en/live-boot.7:89
msgid ""
"Set the timeout in seconds for the device specified by \"live-media=\" to "
"become ready before giving up."
msgstr ""
#. type: IP
-#: en/live-boot.7:87
+#: en/live-boot.7:89
#, no-wrap
msgid "B<module>=I<NAME>"
msgstr "B<module>=I<NAME>"
#. type: Plain text
-#: en/live-boot.7:89
+#: en/live-boot.7:91
msgid ""
"Instead of using the default optional file \"filesystem.module\" (see below) "
"another file could be specified without the extension \".module\"; it should "
@@ -433,13 +446,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:89
+#: en/live-boot.7:91
#, no-wrap
msgid "B<netboot>[=nfs|cifs]"
msgstr "B<netboot>[=nfs|cifs]"
#. type: Plain text
-#: en/live-boot.7:91
+#: en/live-boot.7:93
msgid ""
"This tells live-boot to perform a network mount. The parameter \"nfsroot="
"\" (with optional \"nfsopts=\"), should specify where is the location of the "
@@ -447,24 +460,24 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:91
+#: en/live-boot.7:93
#, no-wrap
msgid "B<nfsopts>="
msgstr "B<nfsopts>="
#. type: Plain text
-#: en/live-boot.7:93
+#: en/live-boot.7:95
msgid "This lets you specify custom nfs options."
msgstr ""
#. type: IP
-#: en/live-boot.7:93
+#: en/live-boot.7:95
#, no-wrap
msgid "B<nofastboot>"
msgstr "B<nofastboot>"
#. type: Plain text
-#: en/live-boot.7:95
+#: en/live-boot.7:97
msgid ""
"This parameter disables the default disabling of filesystem checks in /etc/"
"fstab. If you have static filesystems on your harddisk and you want them to "
@@ -472,48 +485,48 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:95
+#: en/live-boot.7:97
#, no-wrap
msgid "B<nopersistent>"
msgstr "B<nopersistent>"
#. type: Plain text
-#: en/live-boot.7:97
+#: en/live-boot.7:99
msgid ""
"disables the \"persistent\" feature, useful if the bootloader (like "
"syslinux) has been installed with persistent enabled."
msgstr ""
#. type: IP
-#: en/live-boot.7:97
+#: en/live-boot.7:99
#, no-wrap
msgid "B<noprompt>"
msgstr "B<noprompt>"
#. type: Plain text
-#: en/live-boot.7:99
+#: en/live-boot.7:101
msgid "Do not prompt to eject the CD or remove the USB flash drive on reboot."
msgstr ""
#. type: IP
-#: en/live-boot.7:99
+#: en/live-boot.7:101
#, no-wrap
msgid "B<swapon>"
msgstr "B<swapon>"
#. type: Plain text
-#: en/live-boot.7:101
+#: en/live-boot.7:103
msgid "This parameter enables usage of local swap partitions."
msgstr ""
#. type: IP
-#: en/live-boot.7:101
+#: en/live-boot.7:103
#, no-wrap
msgid "B<persistent>[=nofiles]"
msgstr "B<persistent>[=nofiles]"
#. type: Plain text
-#: en/live-boot.7:103
+#: en/live-boot.7:105
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 "
@@ -527,13 +540,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:103
+#: en/live-boot.7:105
#, no-wrap
msgid "B<persistent-path>=I<PATH>"
msgstr "B<persistent-path>=I<PATH>"
#. type: Plain text
-#: en/live-boot.7:105
+#: en/live-boot.7:107
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 "
@@ -541,26 +554,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:105
+#: en/live-boot.7:107
#, 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:107
+#: en/live-boot.7:109
msgid ""
"A path to a file present on the rootfs could be used to preseed debconf "
"database."
msgstr ""
#. type: IP
-#: en/live-boot.7:107
+#: en/live-boot.7:109
#, no-wrap
msgid "B<package/question>=I<VALUE>"
msgstr "B<package/question>=I<VALUE>"
#. type: Plain text
-#: en/live-boot.7:109
+#: en/live-boot.7:111
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 "
@@ -568,26 +581,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:109
+#: en/live-boot.7:111
#, no-wrap
msgid "B<quickreboot>"
msgstr "B<quickreboot>"
#. type: Plain text
-#: en/live-boot.7:111
+#: en/live-boot.7:113
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:111
+#: en/live-boot.7:113
#, no-wrap
msgid "B<showmounts>"
msgstr "B<showmounts>"
#. type: Plain text
-#: en/live-boot.7:113
+#: en/live-boot.7:115
msgid ""
"This parameter will make live-boot to show on \"/\" the ro filesystems "
"(mostly compressed) on \"/live\". This is not enabled by default because "
@@ -596,26 +609,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:113
+#: en/live-boot.7:115
#, no-wrap
msgid "B<silent>"
msgstr "B<silent>"
#. type: Plain text
-#: en/live-boot.7:115
+#: en/live-boot.7:117
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:115
+#: en/live-boot.7:117
#, no-wrap
msgid "B<todisk>=I<DEVICE>"
msgstr "B<todisk>=I<DEVICE>"
#. type: Plain text
-#: en/live-boot.7:117
+#: en/live-boot.7:119
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 "
@@ -625,13 +638,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:117
+#: en/live-boot.7:119
#, no-wrap
msgid "B<toram>"
msgstr "B<toram>"
#. type: Plain text
-#: en/live-boot.7:119
+#: en/live-boot.7:121
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 "
@@ -639,14 +652,14 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:119
+#: en/live-boot.7:121
#, no-wrap
msgid "B<union>=aufs|unionfs"
msgstr "B<union>=aufs|unionfs"
#. FIXME
#. type: Plain text
-#: en/live-boot.7:122
+#: en/live-boot.7:124
msgid ""
"By default, live-boot uses aufs. With this parameter, you can switch to "
"unionfs."
@@ -654,32 +667,32 @@ msgstr ""
#. FIXME
#. type: SH
-#: en/live-boot.7:124
+#: en/live-boot.7:126
#, no-wrap
msgid "FILES (old)"
msgstr ""
#. type: IP
-#: en/live-boot.7:125 en/live-snapshot.1:43
+#: en/live-boot.7:127 en/live-snapshot.1:43
#, no-wrap
msgid "B</etc/live.conf>"
msgstr "B</etc/live.conf>"
#. type: Plain text
-#: en/live-boot.7:127 en/live-snapshot.1:45
+#: en/live-boot.7:129 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:127 en/live-snapshot.1:45
+#: en/live-boot.7:129 en/live-snapshot.1:45
#, no-wrap
msgid "B<live/filesystem.module>"
msgstr "B<live/filesystem.module>"
#. type: Plain text
-#: en/live-boot.7:129 en/live-snapshot.1:47
+#: en/live-boot.7:131 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 \"/"
@@ -692,13 +705,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:129 en/live-snapshot.1:47
+#: en/live-boot.7:131 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:131 en/live-snapshot.1:49
+#: en/live-boot.7:133 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. "
@@ -707,7 +720,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:134 en/live-snapshot.1:51
+#: en/live-boot.7:136 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 "
@@ -716,64 +729,64 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:135 en/live-snapshot.1:42
+#: en/live-boot.7:137 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr "DATEIEN"
#. type: IP
-#: en/live-boot.7:136
+#: en/live-boot.7:138
#, no-wrap
msgid "B</etc/live/boot.conf>"
msgstr "B</etc/live/boot.conf>"
#. type: IP
-#: en/live-boot.7:137
+#: en/live-boot.7:139
#, no-wrap
msgid "B</etc/live/boot.conf.d/>"
msgstr "B</etc/live/boot.conf.d/>"
#. type: IP
-#: en/live-boot.7:138
+#: en/live-boot.7:140
#, no-wrap
msgid "B<live/boot.conf>"
msgstr "B<live/boot.conf>"
#. type: IP
-#: en/live-boot.7:139
+#: en/live-boot.7:141
#, no-wrap
msgid "B<live/boot.conf.d/>"
msgstr "B<live/boot.conf.d/>"
#. type: SH
-#: en/live-boot.7:141 en/live-snapshot.1:52
+#: en/live-boot.7:143 en/live-snapshot.1:52
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-boot.7:143
+#: en/live-boot.7:145
msgid "I<live-snapshot>(1)"
msgstr "I<live-snapshot>(1)"
#. type: Plain text
-#: en/live-boot.7:145 en/live-snapshot.1:56
+#: en/live-boot.7:147 en/live-snapshot.1:56
msgid "I<live-config>(7)"
msgstr "I<live-config>(7)"
#. type: Plain text
-#: en/live-boot.7:147 en/live-snapshot.1:58
+#: en/live-boot.7:149 en/live-snapshot.1:58
msgid "I<live-helper>(7)"
msgstr "I<live-helper>(7)"
#. type: SH
-#: en/live-boot.7:148 en/live-snapshot.1:59
+#: en/live-boot.7:150 en/live-snapshot.1:59
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-boot.7:150 en/live-snapshot.1:61
+#: en/live-boot.7:152 en/live-snapshot.1:61
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 "
@@ -784,13 +797,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-boot.7:151 en/live-snapshot.1:62
+#: en/live-boot.7:153 en/live-snapshot.1:62
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-boot.7:153 en/live-snapshot.1:64
+#: en/live-boot.7:155 en/live-snapshot.1:64
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 "
@@ -804,13 +817,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-boot.7:154 en/live-snapshot.1:65
+#: en/live-boot.7:156 en/live-snapshot.1:65
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-boot.7:155 en/live-snapshot.1:66
+#: en/live-boot.7:157 en/live-snapshot.1:66
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 2274b7f..85245e4 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 2.0~a12\n"
-"POT-Creation-Date: 2010-07-07 20:12+0300\n"
+"Project-Id-Version: live-boot 2.0~a13\n"
+"POT-Creation-Date: 2010-07-15 19:29+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-07-07"
-msgstr "07.07.2010"
+msgid "2010-07-15"
+msgstr "15.07.2010"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0~a12"
-msgstr "2.0~a12"
+msgid "2.0~a13"
+msgstr "2.0~a13"
#. 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:125 en/live-snapshot.1:43
+#: en/live-boot.7:127 en/live-snapshot.1:43
#, no-wrap
msgid "B</etc/live.conf>"
msgstr "B</etc/live.conf>"
#. type: Plain text
-#: en/live-boot.7:127 en/live-snapshot.1:45
+#: en/live-boot.7:129 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:127 en/live-snapshot.1:45
+#: en/live-boot.7:129 en/live-snapshot.1:45
#, no-wrap
msgid "B<live/filesystem.module>"
msgstr "B<live/filesystem.module>"
#. type: Plain text
-#: en/live-boot.7:129 en/live-snapshot.1:47
+#: en/live-boot.7:131 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:129 en/live-snapshot.1:47
+#: en/live-boot.7:131 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:131 en/live-snapshot.1:49
+#: en/live-boot.7:133 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:134 en/live-snapshot.1:51
+#: en/live-boot.7:136 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,35 +114,35 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:135 en/live-snapshot.1:42
+#: en/live-boot.7:137 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr "DATEIEN"
#. type: SH
-#: en/live-boot.7:141 en/live-snapshot.1:52
+#: en/live-boot.7:143 en/live-snapshot.1:52
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-boot.7:145 en/live-snapshot.1:56
+#: en/live-boot.7:147 en/live-snapshot.1:56
msgid "I<live-config>(7)"
msgstr "I<live-config>(7)"
#. type: Plain text
-#: en/live-boot.7:147 en/live-snapshot.1:58
+#: en/live-boot.7:149 en/live-snapshot.1:58
msgid "I<live-helper>(7)"
msgstr "I<live-helper>(7)"
#. type: SH
-#: en/live-boot.7:148 en/live-snapshot.1:59
+#: en/live-boot.7:150 en/live-snapshot.1:59
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-boot.7:150 en/live-snapshot.1:61
+#: en/live-boot.7:152 en/live-snapshot.1:61
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 "
@@ -153,13 +153,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-boot.7:151 en/live-snapshot.1:62
+#: en/live-boot.7:153 en/live-snapshot.1:62
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-boot.7:153 en/live-snapshot.1:64
+#: en/live-boot.7:155 en/live-snapshot.1:64
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 "
@@ -173,13 +173,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-boot.7:154 en/live-snapshot.1:65
+#: en/live-boot.7:156 en/live-snapshot.1:65
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-boot.7:155 en/live-snapshot.1:66
+#: en/live-boot.7:157 en/live-snapshot.1:66
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 73e0f80..4cd3725 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-07-07 20:12+0300\n"
+"POT-Creation-Date: 2010-07-15 19:29+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"
@@ -24,13 +24,13 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-07-07"
+msgid "2010-07-15"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0~a12"
+msgid "2.0~a13"
msgstr ""
#. type: TH
@@ -277,25 +277,38 @@ msgstr ""
#. type: IP
#: en/live-boot.7:67
#, no-wrap
-msgid "B<ignore_uuid>"
+msgid "B<fromiso>=I</PATH/TO/IMAGE>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:69
msgid ""
+"Allows to use a filesystem from within an iso image that's available on live-"
+"media."
+msgstr ""
+
+#. type: IP
+#: en/live-boot.7:69
+#, no-wrap
+msgid "B<ignore_uuid>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:71
+msgid ""
"Do not check that any UUID embedded in the initramfs matches the discovered "
"medium. live-boot may be told to generate a UUID by setting "
"LIVE_GENERATE_UUID=1 when building the initramfs."
msgstr ""
#. type: IP
-#: en/live-boot.7:69
+#: en/live-boot.7:71
#, no-wrap
msgid "B<integrity-check>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:71
+#: en/live-boot.7:73
msgid ""
"If specified, an MD5 sum is calculated on the live media during boot and "
"compared to the value found in md5sum.txt found in the root directory of the "
@@ -303,13 +316,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:71
+#: en/live-boot.7:73
#, no-wrap
msgid "B<ip>=[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<DEVICE>]:[I<AUTOCONF>] [,[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<DEVICE>]:[I<AUTOCONF>]]"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:73
+#: en/live-boot.7:75
msgid ""
"Let you specify the name(s) and the options of the interface(s) that should "
"be configured at boot time. Do not specify this if you want to use dhcp "
@@ -319,13 +332,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:73
+#: en/live-boot.7:75
#, no-wrap
msgid "B<ip>=[I<frommedia>]"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:75
+#: en/live-boot.7:77
msgid ""
"If this variable is set, dhcp and static configuration are just skipped and "
"the system will use the (must be) media-preconfigured /etc/network/"
@@ -333,13 +346,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:75
+#: en/live-boot.7:77
#, no-wrap
msgid "{B<live-media>|B<bootfrom>}=I<DEVICE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:77
+#: en/live-boot.7:79
msgid ""
"If you specify one of this two equivalent forms, live-boot will first try to "
"find this device for the \"/live\" directory where the read-only root "
@@ -348,7 +361,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:79
+#: en/live-boot.7:81
msgid ""
"Instead of specifing an actual device name, the keyword 'removable' can be "
"used to limit the search of acceptable live media to removable type only. "
@@ -357,13 +370,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:79
+#: en/live-boot.7:81
#, no-wrap
msgid "{B<live-media-encryption>|B<encryption>}=I<TYPE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:81
+#: en/live-boot.7:83
msgid ""
"live-boot will mount the encrypted rootfs TYPE, asking the passphrase, "
"useful to build paranoid live systems :-). TYPE supported so far are \"aes\" "
@@ -371,13 +384,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:81
+#: en/live-boot.7:83
#, no-wrap
msgid "B<live-media-offset>=I<BYTES>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:83
+#: en/live-boot.7:85
msgid ""
"This way you could tell live-boot that your image starts at offset BYTES in "
"the above specified or autodiscovered device, this could be useful to hide "
@@ -386,13 +399,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:83
+#: en/live-boot.7:85
#, no-wrap
msgid "B<live-media-path>=I<PATH>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:85
+#: en/live-boot.7:87
msgid ""
"Sets the path to the live filesystem on the medium. By default, it is set to "
"'/live' and you should not change that unless you have customized your media "
@@ -400,26 +413,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:85
+#: en/live-boot.7:87
#, no-wrap
msgid "B<live-media-timeout>=I<SECONDS>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:87
+#: en/live-boot.7:89
msgid ""
"Set the timeout in seconds for the device specified by \"live-media=\" to "
"become ready before giving up."
msgstr ""
#. type: IP
-#: en/live-boot.7:87
+#: en/live-boot.7:89
#, no-wrap
msgid "B<module>=I<NAME>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:89
+#: en/live-boot.7:91
msgid ""
"Instead of using the default optional file \"filesystem.module\" (see below) "
"another file could be specified without the extension \".module\"; it should "
@@ -427,13 +440,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:89
+#: en/live-boot.7:91
#, no-wrap
msgid "B<netboot>[=nfs|cifs]"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:91
+#: en/live-boot.7:93
msgid ""
"This tells live-boot to perform a network mount. The parameter \"nfsroot="
"\" (with optional \"nfsopts=\"), should specify where is the location of the "
@@ -441,24 +454,24 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:91
+#: en/live-boot.7:93
#, no-wrap
msgid "B<nfsopts>="
msgstr ""
#. type: Plain text
-#: en/live-boot.7:93
+#: en/live-boot.7:95
msgid "This lets you specify custom nfs options."
msgstr ""
#. type: IP
-#: en/live-boot.7:93
+#: en/live-boot.7:95
#, no-wrap
msgid "B<nofastboot>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:95
+#: en/live-boot.7:97
msgid ""
"This parameter disables the default disabling of filesystem checks in /etc/"
"fstab. If you have static filesystems on your harddisk and you want them to "
@@ -466,48 +479,48 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:95
+#: en/live-boot.7:97
#, no-wrap
msgid "B<nopersistent>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:97
+#: en/live-boot.7:99
msgid ""
"disables the \"persistent\" feature, useful if the bootloader (like "
"syslinux) has been installed with persistent enabled."
msgstr ""
#. type: IP
-#: en/live-boot.7:97
+#: en/live-boot.7:99
#, no-wrap
msgid "B<noprompt>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:99
+#: en/live-boot.7:101
msgid "Do not prompt to eject the CD or remove the USB flash drive on reboot."
msgstr ""
#. type: IP
-#: en/live-boot.7:99
+#: en/live-boot.7:101
#, no-wrap
msgid "B<swapon>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:101
+#: en/live-boot.7:103
msgid "This parameter enables usage of local swap partitions."
msgstr ""
#. type: IP
-#: en/live-boot.7:101
+#: en/live-boot.7:103
#, no-wrap
msgid "B<persistent>[=nofiles]"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:103
+#: en/live-boot.7:105
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 "
@@ -521,13 +534,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:103
+#: en/live-boot.7:105
#, no-wrap
msgid "B<persistent-path>=I<PATH>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:105
+#: en/live-boot.7:107
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 "
@@ -535,26 +548,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:105
+#: en/live-boot.7:107
#, no-wrap
msgid "{B<preseed/file>|B<file>}=I<FILE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:107
+#: en/live-boot.7:109
msgid ""
"A path to a file present on the rootfs could be used to preseed debconf "
"database."
msgstr ""
#. type: IP
-#: en/live-boot.7:107
+#: en/live-boot.7:109
#, no-wrap
msgid "B<package/question>=I<VALUE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:109
+#: en/live-boot.7:111
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 "
@@ -562,26 +575,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:109
+#: en/live-boot.7:111
#, no-wrap
msgid "B<quickreboot>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:111
+#: en/live-boot.7:113
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:111
+#: en/live-boot.7:113
#, no-wrap
msgid "B<showmounts>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:113
+#: en/live-boot.7:115
msgid ""
"This parameter will make live-boot to show on \"/\" the ro filesystems "
"(mostly compressed) on \"/live\". This is not enabled by default because "
@@ -590,26 +603,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:113
+#: en/live-boot.7:115
#, no-wrap
msgid "B<silent>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:115
+#: en/live-boot.7:117
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:115
+#: en/live-boot.7:117
#, no-wrap
msgid "B<todisk>=I<DEVICE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:117
+#: en/live-boot.7:119
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 "
@@ -619,13 +632,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:117
+#: en/live-boot.7:119
#, no-wrap
msgid "B<toram>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:119
+#: en/live-boot.7:121
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 "
@@ -633,14 +646,14 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:119
+#: en/live-boot.7:121
#, no-wrap
msgid "B<union>=aufs|unionfs"
msgstr ""
#. FIXME
#. type: Plain text
-#: en/live-boot.7:122
+#: en/live-boot.7:124
msgid ""
"By default, live-boot uses aufs. With this parameter, you can switch to "
"unionfs."
@@ -648,32 +661,32 @@ msgstr ""
#. FIXME
#. type: SH
-#: en/live-boot.7:124
+#: en/live-boot.7:126
#, no-wrap
msgid "FILES (old)"
msgstr ""
#. type: IP
-#: en/live-boot.7:125 en/live-snapshot.1:43
+#: en/live-boot.7:127 en/live-snapshot.1:43
#, no-wrap
msgid "B</etc/live.conf>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:127 en/live-snapshot.1:45
+#: en/live-boot.7:129 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:127 en/live-snapshot.1:45
+#: en/live-boot.7:129 en/live-snapshot.1:45
#, no-wrap
msgid "B<live/filesystem.module>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:129 en/live-snapshot.1:47
+#: en/live-boot.7:131 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 \"/"
@@ -686,13 +699,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:129 en/live-snapshot.1:47
+#: en/live-boot.7:131 en/live-snapshot.1:47
#, no-wrap
msgid "B</etc/live-persistence.binds>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:131 en/live-snapshot.1:49
+#: en/live-boot.7:133 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. "
@@ -701,7 +714,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:134 en/live-snapshot.1:51
+#: en/live-boot.7:136 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 "
@@ -710,64 +723,64 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:135 en/live-snapshot.1:42
+#: en/live-boot.7:137 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/live-boot.7:136
+#: en/live-boot.7:138
#, no-wrap
msgid "B</etc/live/boot.conf>"
msgstr ""
#. type: IP
-#: en/live-boot.7:137
+#: en/live-boot.7:139
#, no-wrap
msgid "B</etc/live/boot.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-boot.7:138
+#: en/live-boot.7:140
#, no-wrap
msgid "B<live/boot.conf>"
msgstr ""
#. type: IP
-#: en/live-boot.7:139
+#: en/live-boot.7:141
#, no-wrap
msgid "B<live/boot.conf.d/>"
msgstr ""
#. type: SH
-#: en/live-boot.7:141 en/live-snapshot.1:52
+#: en/live-boot.7:143 en/live-snapshot.1:52
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:143
+#: en/live-boot.7:145
msgid "I<live-snapshot>(1)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:145 en/live-snapshot.1:56
+#: en/live-boot.7:147 en/live-snapshot.1:56
msgid "I<live-config>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:147 en/live-snapshot.1:58
+#: en/live-boot.7:149 en/live-snapshot.1:58
msgid "I<live-helper>(7)"
msgstr ""
#. type: SH
-#: en/live-boot.7:148 en/live-snapshot.1:59
+#: en/live-boot.7:150 en/live-snapshot.1:59
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:150 en/live-snapshot.1:61
+#: en/live-boot.7:152 en/live-snapshot.1:61
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 "
@@ -775,13 +788,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:151 en/live-snapshot.1:62
+#: en/live-boot.7:153 en/live-snapshot.1:62
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:153 en/live-snapshot.1:64
+#: en/live-boot.7:155 en/live-snapshot.1:64
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 "
@@ -790,13 +803,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:154 en/live-snapshot.1:65
+#: en/live-boot.7:156 en/live-snapshot.1:65
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:155 en/live-snapshot.1:66
+#: en/live-boot.7:157 en/live-snapshot.1:66
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 ddca5ff..731fc95 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-07-07 20:12+0300\n"
+"POT-Creation-Date: 2010-07-15 19:29+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"
@@ -24,13 +24,13 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-07-07"
+msgid "2010-07-15"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0~a12"
+msgid "2.0~a13"
msgstr ""
#. type: TH
@@ -58,26 +58,26 @@ msgid "OPTIONS"
msgstr ""
#. type: IP
-#: en/live-boot.7:125 en/live-snapshot.1:43
+#: en/live-boot.7:127 en/live-snapshot.1:43
#, no-wrap
msgid "B</etc/live.conf>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:127 en/live-snapshot.1:45
+#: en/live-boot.7:129 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:127 en/live-snapshot.1:45
+#: en/live-boot.7:129 en/live-snapshot.1:45
#, no-wrap
msgid "B<live/filesystem.module>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:129 en/live-snapshot.1:47
+#: en/live-boot.7:131 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:129 en/live-snapshot.1:47
+#: en/live-boot.7:131 en/live-snapshot.1:47
#, no-wrap
msgid "B</etc/live-persistence.binds>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:131 en/live-snapshot.1:49
+#: en/live-boot.7:133 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:134 en/live-snapshot.1:51
+#: en/live-boot.7:136 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,35 +114,35 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:135 en/live-snapshot.1:42
+#: en/live-boot.7:137 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr ""
#. type: SH
-#: en/live-boot.7:141 en/live-snapshot.1:52
+#: en/live-boot.7:143 en/live-snapshot.1:52
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:145 en/live-snapshot.1:56
+#: en/live-boot.7:147 en/live-snapshot.1:56
msgid "I<live-config>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:147 en/live-snapshot.1:58
+#: en/live-boot.7:149 en/live-snapshot.1:58
msgid "I<live-helper>(7)"
msgstr ""
#. type: SH
-#: en/live-boot.7:148 en/live-snapshot.1:59
+#: en/live-boot.7:150 en/live-snapshot.1:59
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:150 en/live-snapshot.1:61
+#: en/live-boot.7:152 en/live-snapshot.1:61
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 "
@@ -150,13 +150,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:151 en/live-snapshot.1:62
+#: en/live-boot.7:153 en/live-snapshot.1:62
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:153 en/live-snapshot.1:64
+#: en/live-boot.7:155 en/live-snapshot.1:64
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 "
@@ -165,13 +165,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:154 en/live-snapshot.1:65
+#: en/live-boot.7:156 en/live-snapshot.1:65
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:155 en/live-snapshot.1:66
+#: en/live-boot.7:157 en/live-snapshot.1:66
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