Adding upstream version 3.0~a11.

diff --git a/VERSION b/VERSION
index bf14168..2e25043 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a10
+3.0~a11

diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 9f30a09..7235742 100644 (file)
--- 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.
 .\"
 .\"*******************************************************************
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************

-.TH LIVE\-BOOT 7 27.10.2010 3.0~a10 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 28.10.2010 3.0~a11 "Debian Live Projekt"

 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Skripte
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Skripte


@@ -159,6 +159,9 @@ disables the "persistent" feature, useful if the bootloader (like syslinux)
 has been installed with persistent enabled.
 .IP \fBnoprompt\fP 4
 Do not prompt to eject the CD or remove the USB flash drive on reboot.
 has been installed with persistent enabled.
 .IP \fBnoprompt\fP 4
 Do not prompt to eject the CD or remove the USB flash drive on reboot.

+.IP \fBnoprompt\fP=\fITYPE\fP 4
+This tells live\-boot not to prompt to eject the CD (when noprompt=cd) or
+remove the USB flash drive (when noprompt=usb) on reboot.

 .IP \fBswapon\fP 4
 This parameter enables usage of local swap partitions.
 .IP \fBpersistent\fP[={nofiles|cryptsetup}] 4
 .IP \fBswapon\fP 4
 This parameter enables usage of local swap partitions.
 .IP \fBpersistent\fP[={nofiles|cryptsetup}] 4

diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index 9cff238..5ff8a2b 100644 (file)
--- 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.
 .\"
 .\"*******************************************************************
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************

-.TH LIVE\-BOOT 1 27.10.2010 3.0~a10 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 28.10.2010 3.0~a11 "Debian Live Projekt"

 
 .SH NAME
 \fBlive\-snapshot\fP \- simple script to ease persistence usage
 
 .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 1d0d45b..e75db6b 100644 (file)
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2010\-10\-27 3.0~a10 "Debian Live Project"
+.TH LIVE\-BOOT 7 2010\-10\-28 3.0~a11 "Debian Live Project"

 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts


@@ -98,6 +98,8 @@ This parameter disables the default disabling of filesystem checks in /etc/fstab
 disables the "persistent" feature, useful if the bootloader (like syslinux) has been installed with persistent enabled.
 .IP "\fBnoprompt\fR" 4
 Do not prompt to eject the CD or remove the USB flash drive on reboot.
 disables the "persistent" feature, useful if the bootloader (like syslinux) has been installed with persistent enabled.
 .IP "\fBnoprompt\fR" 4
 Do not prompt to eject the CD or remove the USB flash drive on reboot.

+.IP "\fBnoprompt\fR=\fITYPE\fR" 4
+This tells live-boot not to prompt to eject the CD (when noprompt=cd) or remove the USB flash drive (when noprompt=usb) on reboot.

 .IP "\fBswapon\fR" 4
 This parameter enables usage of local swap partitions.
 .IP "\fBpersistent\fR[={nofiles|cryptsetup}]" 4
 .IP "\fBswapon\fR" 4
 This parameter enables usage of local swap partitions.
 .IP "\fBpersistent\fR[={nofiles|cryptsetup}]" 4

diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1
index feafdbe..d3bd25a 100644 (file)
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2010\-10\-27 3.0~a10 "Debian Live Project"
+.TH LIVE\-BOOT 1 2010\-10\-28 3.0~a11 "Debian Live Project"

 
 .SH NAME
 \fBlive\-snapshot\fR \- simple script to ease persistence usage
 
 .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 a6d3fb9..16060a1 100644 (file)
--- a/manpages/po/de/live-boot.7.po
+++ b/manpages/po/de/live-boot.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: live-boot 3.0~a9\n"
-"POT-Creation-Date: 2010-10-27 14:57+0300\n"
+"Project-Id-Version: live-boot 3.0~a11\n"
+"POT-Creation-Date: 2010-10-28 09:27+0300\n"

 "PO-Revision-Date: 2010-05-24 12:34+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
 "PO-Revision-Date: 2010-05-24 12:34+0300\n"
 "Last-Translator: Daniel Baumann <daniel@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
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap

-msgid "2010-10-27"
-msgstr "27.10.2010"
+msgid "2010-10-28"
+msgstr "28.10.2010"

 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap

-msgid "3.0~a10"
-msgstr "3.0~a10"
+msgid "3.0~a11"
+msgstr "3.0~a11"

 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1


@@ -511,22 +511,35 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:101
 #, no-wrap
 #. type: IP
 #: en/live-boot.7:101
 #, no-wrap

+msgid "B<noprompt>=I<TYPE>"
+msgstr "B<noprompt>=I<TYPE>"
+
+#. type: Plain text
+#: en/live-boot.7:103
+msgid ""
+"This tells live-boot not to prompt to eject the CD (when noprompt=cd) or "
+"remove the USB flash drive (when noprompt=usb) on reboot."
+msgstr ""
+
+#. type: IP
+#: en/live-boot.7:103
+#, no-wrap

 msgid "B<swapon>"
 msgstr "B<swapon>"
 
 #. type: Plain text
 msgid "B<swapon>"
 msgstr "B<swapon>"
 
 #. type: Plain text

-#: en/live-boot.7:103
+#: en/live-boot.7:105

 msgid "This parameter enables usage of local swap partitions."
 msgstr ""
 
 #. type: IP
 msgid "This parameter enables usage of local swap partitions."
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:103
+#: en/live-boot.7:105

 #, no-wrap
 msgid "B<persistent>[={nofiles|cryptsetup}]"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "B<persistent>[={nofiles|cryptsetup}]"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:105
+#: en/live-boot.7:107

 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 "
 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 "


@@ -537,7 +550,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:107
+#: en/live-boot.7:109

 msgid ""
 "If \"nofiles\" is specified, only filesystems with matching labels will be "
 "searched; no filesystems will be traversed looking for archives or image "
 msgid ""
 "If \"nofiles\" is specified, only filesystems with matching labels will be "
 "searched; no filesystems will be traversed looking for archives or image "


@@ -545,7 +558,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:109
+#: en/live-boot.7:111

 msgid ""
 "If \"cryptsetup\" is specified, filesystems stored on Luks-encrypted devices "
 "will be considered as well as others when searching for a persistence "
 msgid ""
 "If \"cryptsetup\" is specified, filesystems stored on Luks-encrypted devices "
 "will be considered as well as others when searching for a persistence "


@@ -553,13 +566,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:109
+#: en/live-boot.7:111

 #, no-wrap
 msgid "B<persistent-path>=I<PATH>"
 msgstr "B<persistent-path>=I<PATH>"
 
 #. type: Plain text
 #, no-wrap
 msgid "B<persistent-path>=I<PATH>"
 msgstr "B<persistent-path>=I<PATH>"
 
 #. type: Plain text

-#: en/live-boot.7:111
+#: en/live-boot.7:113

 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 "
 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 "


@@ -567,13 +580,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:111
+#: en/live-boot.7:113

 #, no-wrap
 msgid "B<persistent-subtext>=I<SUFFIX>"
 msgstr "B<persistent-subtext>=I<SUFFIX>"
 
 #. type: Plain text
 #, no-wrap
 msgid "B<persistent-subtext>=I<SUFFIX>"
 msgstr "B<persistent-subtext>=I<SUFFIX>"
 
 #. type: Plain text

-#: en/live-boot.7:113
+#: en/live-boot.7:115

 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 "
 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 "


@@ -583,26 +596,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:113
+#: en/live-boot.7:115

 #, no-wrap
 msgid "{B<preseed/file>|B<file>}=I<FILE>"
 msgstr "{B<preseed/file>|B<file>}=I<FILE>"
 
 #. type: Plain text
 #, 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:115
+#: en/live-boot.7:117

 msgid ""
 "A path to a file present on the rootfs could be used to preseed debconf "
 "database."
 msgstr ""
 
 #. type: IP
 msgid ""
 "A path to a file present on the rootfs could be used to preseed debconf "
 "database."
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:115
+#: en/live-boot.7:117

 #, no-wrap
 msgid "B<package/question>=I<VALUE>"
 msgstr "B<package/question>=I<VALUE>"
 
 #. type: Plain text
 #, no-wrap
 msgid "B<package/question>=I<VALUE>"
 msgstr "B<package/question>=I<VALUE>"
 
 #. type: Plain text

-#: en/live-boot.7:117
+#: en/live-boot.7:119

 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 "
 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 "


@@ -610,26 +623,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:117
+#: en/live-boot.7:119

 #, no-wrap
 msgid "B<quickreboot>"
 msgstr "B<quickreboot>"
 
 #. type: Plain text
 #, no-wrap
 msgid "B<quickreboot>"
 msgstr "B<quickreboot>"
 
 #. type: Plain text

-#: en/live-boot.7:119
+#: en/live-boot.7:121

 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
 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:119
+#: en/live-boot.7:121

 #, no-wrap
 msgid "B<showmounts>"
 msgstr "B<showmounts>"
 
 #. type: Plain text
 #, no-wrap
 msgid "B<showmounts>"
 msgstr "B<showmounts>"
 
 #. type: Plain text

-#: en/live-boot.7:121
+#: en/live-boot.7:123

 msgid ""
 "This parameter will make live-boot to show on \"/\" the ro filesystems "
 "(mostly compressed) on \"/live\". This is not enabled by default because "
 msgid ""
 "This parameter will make live-boot to show on \"/\" the ro filesystems "
 "(mostly compressed) on \"/live\". This is not enabled by default because "


@@ -638,26 +651,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:121
+#: en/live-boot.7:123

 #, no-wrap
 msgid "B<silent>"
 msgstr "B<silent>"
 
 #. type: Plain text
 #, no-wrap
 msgid "B<silent>"
 msgstr "B<silent>"
 
 #. type: Plain text

-#: en/live-boot.7:123
+#: en/live-boot.7:125

 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
 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:123
+#: en/live-boot.7:125

 #, no-wrap
 msgid "B<todisk>=I<DEVICE>"
 msgstr "B<todisk>=I<DEVICE>"
 
 #. type: Plain text
 #, no-wrap
 msgid "B<todisk>=I<DEVICE>"
 msgstr "B<todisk>=I<DEVICE>"
 
 #. type: Plain text

-#: en/live-boot.7:125
+#: en/live-boot.7:127

 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 "
 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 "


@@ -667,13 +680,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:125
+#: en/live-boot.7:127

 #, no-wrap
 msgid "B<toram>"
 msgstr "B<toram>"
 
 #. type: Plain text
 #, no-wrap
 msgid "B<toram>"
 msgstr "B<toram>"
 
 #. type: Plain text

-#: en/live-boot.7:127
+#: en/live-boot.7:129

 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 "
 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 "


@@ -681,14 +694,14 @@ msgid ""
 msgstr ""
 
 #. type: IP
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:127
+#: en/live-boot.7:129

 #, no-wrap
 msgid "B<union>=aufs|unionfs"
 msgstr "B<union>=aufs|unionfs"
 
 #.  FIXME
 #. type: Plain text
 #, no-wrap
 msgid "B<union>=aufs|unionfs"
 msgstr "B<union>=aufs|unionfs"
 
 #.  FIXME
 #. type: Plain text

-#: en/live-boot.7:130
+#: en/live-boot.7:132

 msgid ""
 "By default, live-boot uses aufs. With this parameter, you can switch to "
 "unionfs."
 msgid ""
 "By default, live-boot uses aufs. With this parameter, you can switch to "
 "unionfs."


@@ -696,32 +709,32 @@ msgstr ""
 
 #.  FIXME
 #. type: SH
 
 #.  FIXME
 #. type: SH

-#: en/live-boot.7:132
+#: en/live-boot.7:134

 #, no-wrap
 msgid "FILES (old)"
 msgstr ""
 
 #. type: IP
 #, no-wrap
 msgid "FILES (old)"
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:133 en/live-snapshot.1:43
+#: en/live-boot.7:135 en/live-snapshot.1:43

 #, no-wrap
 msgid "B</etc/live.conf>"
 msgstr "B</etc/live.conf>"
 
 #. type: Plain text
 #, no-wrap
 msgid "B</etc/live.conf>"
 msgstr "B</etc/live.conf>"
 
 #. type: Plain text

-#: en/live-boot.7:135 en/live-snapshot.1:45
+#: en/live-boot.7:137 en/live-snapshot.1:45

 msgid ""
 "Some variables can be configured via this config file (inside the live "
 "system)."
 msgstr ""
 
 #. type: IP
 msgid ""
 "Some variables can be configured via this config file (inside the live "
 "system)."
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:135 en/live-snapshot.1:45
+#: en/live-boot.7:137 en/live-snapshot.1:45

 #, no-wrap
 msgid "B<live/filesystem.module>"
 msgstr "B<live/filesystem.module>"
 
 #. type: Plain text
 #, no-wrap
 msgid "B<live/filesystem.module>"
 msgstr "B<live/filesystem.module>"
 
 #. type: Plain text

-#: en/live-boot.7:137 en/live-snapshot.1:47
+#: en/live-boot.7:139 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 \"/"
 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 \"/"


@@ -734,13 +747,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:137 en/live-snapshot.1:47
+#: en/live-boot.7:139 en/live-snapshot.1:47

 #, no-wrap
 msgid "B</etc/live-persistence.binds>"
 msgstr "B</etc/live-persistence.binds>"
 
 #. type: Plain text
 #, no-wrap
 msgid "B</etc/live-persistence.binds>"
 msgstr "B</etc/live-persistence.binds>"
 
 #. type: Plain text

-#: en/live-boot.7:139 en/live-snapshot.1:49
+#: en/live-boot.7:141 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. "
 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. "


@@ -749,7 +762,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:142 en/live-snapshot.1:51
+#: en/live-boot.7:144 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 "
 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 "


@@ -758,69 +771,69 @@ msgid ""
 msgstr ""
 
 #. type: SH
 msgstr ""
 
 #. type: SH

-#: en/live-boot.7:143 en/live-snapshot.1:42
+#: en/live-boot.7:145 en/live-snapshot.1:42

 #, no-wrap
 msgid "FILES"
 msgstr "DATEIEN"
 
 #. type: IP
 #, no-wrap
 msgid "FILES"
 msgstr "DATEIEN"
 
 #. type: IP

-#: en/live-boot.7:144
+#: en/live-boot.7:146

 #, no-wrap
 msgid "B</etc/live/boot.conf>"
 msgstr "B</etc/live/boot.conf>"
 
 #. type: IP
 #, no-wrap
 msgid "B</etc/live/boot.conf>"
 msgstr "B</etc/live/boot.conf>"
 
 #. type: IP

-#: en/live-boot.7:145
+#: en/live-boot.7:147

 #, no-wrap
 msgid "B</etc/live/boot.d/>"
 msgstr "B</etc/live/boot.d/>"
 
 #. type: IP
 #, no-wrap
 msgid "B</etc/live/boot.d/>"
 msgstr "B</etc/live/boot.d/>"
 
 #. type: IP

-#: en/live-boot.7:146
+#: en/live-boot.7:148

 #, no-wrap
 msgid "B<live/boot.conf>"
 msgstr "B<live/boot.conf>"
 
 #. type: IP
 #, no-wrap
 msgid "B<live/boot.conf>"
 msgstr "B<live/boot.conf>"
 
 #. type: IP

-#: en/live-boot.7:147
+#: en/live-boot.7:149

 #, no-wrap
 msgid "B<live/boot.d/>"
 msgstr "B<live/boot.d/>"
 
 #. type: SH
 #, no-wrap
 msgid "B<live/boot.d/>"
 msgstr "B<live/boot.d/>"
 
 #. type: SH

-#: en/live-boot.7:149 en/live-snapshot.1:54
+#: en/live-boot.7:151 en/live-snapshot.1:54

 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
 
 #. type: Plain text
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
 
 #. type: Plain text

-#: en/live-boot.7:151
+#: en/live-boot.7:153

 msgid "I<live-snapshot>(1)"
 msgstr "I<live-snapshot>(1)"
 
 #. type: Plain text
 msgid "I<live-snapshot>(1)"
 msgstr "I<live-snapshot>(1)"
 
 #. type: Plain text

-#: en/live-boot.7:153 en/live-snapshot.1:58
+#: en/live-boot.7:155 en/live-snapshot.1:58

 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text

-#: en/live-boot.7:155 en/live-snapshot.1:60
+#: en/live-boot.7:157 en/live-snapshot.1:60

 msgid "I<live-config>(7)"
 msgstr "I<live-config>(7)"
 
 #. type: Plain text
 msgid "I<live-config>(7)"
 msgstr "I<live-config>(7)"
 
 #. type: Plain text

-#: en/live-boot.7:157 en/live-snapshot.1:62
+#: en/live-boot.7:159 en/live-snapshot.1:62

 msgid "I<live-tools>(7)"
 msgstr "I<live-tools>(7)"
 
 #. type: SH
 msgid "I<live-tools>(7)"
 msgstr "I<live-tools>(7)"
 
 #. type: SH

-#: en/live-boot.7:158 en/live-snapshot.1:63
+#: en/live-boot.7:160 en/live-snapshot.1:63

 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "HOMEPAGE"
 
 #. type: Plain text
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "HOMEPAGE"
 
 #. type: Plain text

-#: en/live-boot.7:160 en/live-snapshot.1:65
+#: en/live-boot.7:162 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 "
 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 "


@@ -831,13 +844,13 @@ msgstr ""
 "unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
 
 #. type: SH
 "unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
 
 #. type: SH

-#: en/live-boot.7:161 en/live-snapshot.1:66
+#: en/live-boot.7:163 en/live-snapshot.1:66

 #, no-wrap
 msgid "BUGS"
 msgstr "FEHLER"
 
 #. type: Plain text
 #, no-wrap
 msgid "BUGS"
 msgstr "FEHLER"
 
 #. type: Plain text

-#: en/live-boot.7:163 en/live-snapshot.1:68
+#: en/live-boot.7:165 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 "
 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 "


@@ -851,13 +864,13 @@ msgstr ""
 "werden."
 
 #. type: SH
 "werden."
 
 #. type: SH

-#: en/live-boot.7:164 en/live-snapshot.1:69
+#: en/live-boot.7:166 en/live-snapshot.1:69

 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text

-#: en/live-boot.7:165 en/live-snapshot.1:70
+#: en/live-boot.7:167 en/live-snapshot.1:70

 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<daniel@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 16b8456..9ddcda6 100644 (file)
--- a/manpages/po/de/live-snapshot.1.po
+++ b/manpages/po/de/live-snapshot.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: live-boot 3.0~a9\n"
-"POT-Creation-Date: 2010-10-27 14:57+0300\n"
+"Project-Id-Version: live-boot 3.0~a11\n"
+"POT-Creation-Date: 2010-10-28 09:27+0300\n"

 "PO-Revision-Date: 2010-05-24 12:34+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
 "PO-Revision-Date: 2010-05-24 12:34+0300\n"
 "Last-Translator: Daniel Baumann <daniel@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
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap

-msgid "2010-10-27"
-msgstr "27.10.2010"
+msgid "2010-10-28"
+msgstr "28.10.2010"

 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap

-msgid "3.0~a10"
-msgstr "3.0~a10"
+msgid "3.0~a11"
+msgstr "3.0~a11"

 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1


@@ -58,26 +58,26 @@ msgid "OPTIONS"
 msgstr "OPTIONEN"
 
 #. type: IP
 msgstr "OPTIONEN"
 
 #. type: IP

-#: en/live-boot.7:133 en/live-snapshot.1:43
+#: en/live-boot.7:135 en/live-snapshot.1:43

 #, no-wrap
 msgid "B</etc/live.conf>"
 msgstr "B</etc/live.conf>"
 
 #. type: Plain text
 #, no-wrap
 msgid "B</etc/live.conf>"
 msgstr "B</etc/live.conf>"
 
 #. type: Plain text

-#: en/live-boot.7:135 en/live-snapshot.1:45
+#: en/live-boot.7:137 en/live-snapshot.1:45

 msgid ""
 "Some variables can be configured via this config file (inside the live "
 "system)."
 msgstr ""
 
 #. type: IP
 msgid ""
 "Some variables can be configured via this config file (inside the live "
 "system)."
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:135 en/live-snapshot.1:45
+#: en/live-boot.7:137 en/live-snapshot.1:45

 #, no-wrap
 msgid "B<live/filesystem.module>"
 msgstr "B<live/filesystem.module>"
 
 #. type: Plain text
 #, no-wrap
 msgid "B<live/filesystem.module>"
 msgstr "B<live/filesystem.module>"
 
 #. type: Plain text

-#: en/live-boot.7:137 en/live-snapshot.1:47
+#: en/live-boot.7:139 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 \"/"
 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
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:137 en/live-snapshot.1:47
+#: en/live-boot.7:139 en/live-snapshot.1:47

 #, no-wrap
 msgid "B</etc/live-persistence.binds>"
 msgstr "B</etc/live-persistence.binds>"
 
 #. type: Plain text
 #, no-wrap
 msgid "B</etc/live-persistence.binds>"
 msgstr "B</etc/live-persistence.binds>"
 
 #. type: Plain text

-#: en/live-boot.7:139 en/live-snapshot.1:49
+#: en/live-boot.7:141 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. "
 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
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:142 en/live-snapshot.1:51
+#: en/live-boot.7:144 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 "
 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
 msgstr ""
 
 #. type: SH

-#: en/live-boot.7:143 en/live-snapshot.1:42
+#: en/live-boot.7:145 en/live-snapshot.1:42

 #, no-wrap
 msgid "FILES"
 msgstr "DATEIEN"
 
 #. type: SH
 #, no-wrap
 msgid "FILES"
 msgstr "DATEIEN"
 
 #. type: SH

-#: en/live-boot.7:149 en/live-snapshot.1:54
+#: en/live-boot.7:151 en/live-snapshot.1:54

 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
 
 #. type: Plain text
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
 
 #. type: Plain text

-#: en/live-boot.7:153 en/live-snapshot.1:58
+#: en/live-boot.7:155 en/live-snapshot.1:58

 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text

-#: en/live-boot.7:155 en/live-snapshot.1:60
+#: en/live-boot.7:157 en/live-snapshot.1:60

 msgid "I<live-config>(7)"
 msgstr "I<live-config>(7)"
 
 #. type: Plain text
 msgid "I<live-config>(7)"
 msgstr "I<live-config>(7)"
 
 #. type: Plain text

-#: en/live-boot.7:157 en/live-snapshot.1:62
+#: en/live-boot.7:159 en/live-snapshot.1:62

 msgid "I<live-tools>(7)"
 msgstr "I<live-tools>(7)"
 
 #. type: SH
 msgid "I<live-tools>(7)"
 msgstr "I<live-tools>(7)"
 
 #. type: SH

-#: en/live-boot.7:158 en/live-snapshot.1:63
+#: en/live-boot.7:160 en/live-snapshot.1:63

 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "HOMEPAGE"
 
 #. type: Plain text
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "HOMEPAGE"
 
 #. type: Plain text

-#: en/live-boot.7:160 en/live-snapshot.1:65
+#: en/live-boot.7:162 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 "
 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
 "unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
 
 #. type: SH

-#: en/live-boot.7:161 en/live-snapshot.1:66
+#: en/live-boot.7:163 en/live-snapshot.1:66

 #, no-wrap
 msgid "BUGS"
 msgstr "FEHLER"
 
 #. type: Plain text
 #, no-wrap
 msgid "BUGS"
 msgstr "FEHLER"
 
 #. type: Plain text

-#: en/live-boot.7:163 en/live-snapshot.1:68
+#: en/live-boot.7:165 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 "
 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
 "werden."
 
 #. type: SH

-#: en/live-boot.7:164 en/live-snapshot.1:69
+#: en/live-boot.7:166 en/live-snapshot.1:69

 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text

-#: en/live-boot.7:165 en/live-snapshot.1:70
+#: en/live-boot.7:167 en/live-snapshot.1:70

 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<daniel@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 0b1027c..37a303c 100644 (file)
--- 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"
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"

-"POT-Creation-Date: 2010-10-27 14:57+0300\n"
+"POT-Creation-Date: 2010-10-28 09:27+0300\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap

-msgid "2010-10-27"
+msgid "2010-10-28"

 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap

-msgid "3.0~a10"
+msgid "3.0~a11"

 msgstr ""
 
 #. type: TH
 msgstr ""
 
 #. type: TH


@@ -506,22 +506,35 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:101
 #, no-wrap
 #. type: IP
 #: en/live-boot.7:101
 #, no-wrap

-msgid "B<swapon>"
+msgid "B<noprompt>=I<TYPE>"

 msgstr ""
 
 #. type: Plain text
 #: en/live-boot.7:103
 msgstr ""
 
 #. type: Plain text
 #: en/live-boot.7:103

-msgid "This parameter enables usage of local swap partitions."
+msgid ""
+"This tells live-boot not to prompt to eject the CD (when noprompt=cd) or "
+"remove the USB flash drive (when noprompt=usb) on reboot."

 msgstr ""
 
 #. type: IP
 #: en/live-boot.7:103
 #, no-wrap
 msgstr ""
 
 #. type: IP
 #: en/live-boot.7:103
 #, no-wrap

-msgid "B<persistent>[={nofiles|cryptsetup}]"
+msgid "B<swapon>"

 msgstr ""
 
 #. type: Plain text
 #: en/live-boot.7:105
 msgstr ""
 
 #. type: Plain text
 #: en/live-boot.7:105

+msgid "This parameter enables usage of local swap partitions."
+msgstr ""
+
+#. type: IP
+#: en/live-boot.7:105
+#, no-wrap
+msgid "B<persistent>[={nofiles|cryptsetup}]"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:107

 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 "
 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 "


@@ -532,7 +545,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:107
+#: en/live-boot.7:109

 msgid ""
 "If \"nofiles\" is specified, only filesystems with matching labels will be "
 "searched; no filesystems will be traversed looking for archives or image "
 msgid ""
 "If \"nofiles\" is specified, only filesystems with matching labels will be "
 "searched; no filesystems will be traversed looking for archives or image "


@@ -540,7 +553,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:109
+#: en/live-boot.7:111

 msgid ""
 "If \"cryptsetup\" is specified, filesystems stored on Luks-encrypted devices "
 "will be considered as well as others when searching for a persistence "
 msgid ""
 "If \"cryptsetup\" is specified, filesystems stored on Luks-encrypted devices "
 "will be considered as well as others when searching for a persistence "


@@ -548,13 +561,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:109
+#: en/live-boot.7:111

 #, no-wrap
 msgid "B<persistent-path>=I<PATH>"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "B<persistent-path>=I<PATH>"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:111
+#: en/live-boot.7:113

 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 "
 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 "


@@ -562,13 +575,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:111
+#: en/live-boot.7:113

 #, no-wrap
 msgid "B<persistent-subtext>=I<SUFFIX>"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "B<persistent-subtext>=I<SUFFIX>"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:113
+#: en/live-boot.7:115

 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 "
 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 "


@@ -578,26 +591,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:113
+#: en/live-boot.7:115

 #, no-wrap
 msgid "{B<preseed/file>|B<file>}=I<FILE>"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "{B<preseed/file>|B<file>}=I<FILE>"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:115
+#: en/live-boot.7:117

 msgid ""
 "A path to a file present on the rootfs could be used to preseed debconf "
 "database."
 msgstr ""
 
 #. type: IP
 msgid ""
 "A path to a file present on the rootfs could be used to preseed debconf "
 "database."
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:115
+#: en/live-boot.7:117

 #, no-wrap
 msgid "B<package/question>=I<VALUE>"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "B<package/question>=I<VALUE>"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:117
+#: en/live-boot.7:119

 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 "
 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 "


@@ -605,26 +618,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:117
+#: en/live-boot.7:119

 #, no-wrap
 msgid "B<quickreboot>"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "B<quickreboot>"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:119
+#: en/live-boot.7:121

 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
 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:119
+#: en/live-boot.7:121

 #, no-wrap
 msgid "B<showmounts>"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "B<showmounts>"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:121
+#: en/live-boot.7:123

 msgid ""
 "This parameter will make live-boot to show on \"/\" the ro filesystems "
 "(mostly compressed) on \"/live\". This is not enabled by default because "
 msgid ""
 "This parameter will make live-boot to show on \"/\" the ro filesystems "
 "(mostly compressed) on \"/live\". This is not enabled by default because "


@@ -633,26 +646,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:121
+#: en/live-boot.7:123

 #, no-wrap
 msgid "B<silent>"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "B<silent>"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:123
+#: en/live-boot.7:125

 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
 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:123
+#: en/live-boot.7:125

 #, no-wrap
 msgid "B<todisk>=I<DEVICE>"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "B<todisk>=I<DEVICE>"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:125
+#: en/live-boot.7:127

 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 "
 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 "


@@ -662,13 +675,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:125
+#: en/live-boot.7:127

 #, no-wrap
 msgid "B<toram>"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "B<toram>"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:127
+#: en/live-boot.7:129

 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 "
 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 "


@@ -676,14 +689,14 @@ msgid ""
 msgstr ""
 
 #. type: IP
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:127
+#: en/live-boot.7:129

 #, no-wrap
 msgid "B<union>=aufs|unionfs"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
 #, no-wrap
 msgid "B<union>=aufs|unionfs"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text

-#: en/live-boot.7:130
+#: en/live-boot.7:132

 msgid ""
 "By default, live-boot uses aufs. With this parameter, you can switch to "
 "unionfs."
 msgid ""
 "By default, live-boot uses aufs. With this parameter, you can switch to "
 "unionfs."


@@ -691,32 +704,32 @@ msgstr ""
 
 #.  FIXME
 #. type: SH
 
 #.  FIXME
 #. type: SH

-#: en/live-boot.7:132
+#: en/live-boot.7:134

 #, no-wrap
 msgid "FILES (old)"
 msgstr ""
 
 #. type: IP
 #, no-wrap
 msgid "FILES (old)"
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:133 en/live-snapshot.1:43
+#: en/live-boot.7:135 en/live-snapshot.1:43

 #, no-wrap
 msgid "B</etc/live.conf>"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "B</etc/live.conf>"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:135 en/live-snapshot.1:45
+#: en/live-boot.7:137 en/live-snapshot.1:45

 msgid ""
 "Some variables can be configured via this config file (inside the live "
 "system)."
 msgstr ""
 
 #. type: IP
 msgid ""
 "Some variables can be configured via this config file (inside the live "
 "system)."
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:135 en/live-snapshot.1:45
+#: en/live-boot.7:137 en/live-snapshot.1:45

 #, no-wrap
 msgid "B<live/filesystem.module>"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "B<live/filesystem.module>"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:137 en/live-snapshot.1:47
+#: en/live-boot.7:139 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 \"/"
 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 \"/"


@@ -729,13 +742,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:137 en/live-snapshot.1:47
+#: en/live-boot.7:139 en/live-snapshot.1:47

 #, no-wrap
 msgid "B</etc/live-persistence.binds>"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "B</etc/live-persistence.binds>"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:139 en/live-snapshot.1:49
+#: en/live-boot.7:141 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. "
 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. "


@@ -744,7 +757,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:142 en/live-snapshot.1:51
+#: en/live-boot.7:144 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 "
 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 "


@@ -753,69 +766,69 @@ msgid ""
 msgstr ""
 
 #. type: SH
 msgstr ""
 
 #. type: SH

-#: en/live-boot.7:143 en/live-snapshot.1:42
+#: en/live-boot.7:145 en/live-snapshot.1:42

 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: IP
 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:144
+#: en/live-boot.7:146

 #, no-wrap
 msgid "B</etc/live/boot.conf>"
 msgstr ""
 
 #. type: IP
 #, no-wrap
 msgid "B</etc/live/boot.conf>"
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:145
+#: en/live-boot.7:147

 #, no-wrap
 msgid "B</etc/live/boot.d/>"
 msgstr ""
 
 #. type: IP
 #, no-wrap
 msgid "B</etc/live/boot.d/>"
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:146
+#: en/live-boot.7:148

 #, no-wrap
 msgid "B<live/boot.conf>"
 msgstr ""
 
 #. type: IP
 #, no-wrap
 msgid "B<live/boot.conf>"
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:147
+#: en/live-boot.7:149

 #, no-wrap
 msgid "B<live/boot.d/>"
 msgstr ""
 
 #. type: SH
 #, no-wrap
 msgid "B<live/boot.d/>"
 msgstr ""
 
 #. type: SH

-#: en/live-boot.7:149 en/live-snapshot.1:54
+#: en/live-boot.7:151 en/live-snapshot.1:54

 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:151
+#: en/live-boot.7:153

 msgid "I<live-snapshot>(1)"
 msgstr ""
 
 #. type: Plain text
 msgid "I<live-snapshot>(1)"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:153 en/live-snapshot.1:58
+#: en/live-boot.7:155 en/live-snapshot.1:58

 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:155 en/live-snapshot.1:60
+#: en/live-boot.7:157 en/live-snapshot.1:60

 msgid "I<live-config>(7)"
 msgstr ""
 
 #. type: Plain text
 msgid "I<live-config>(7)"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:157 en/live-snapshot.1:62
+#: en/live-boot.7:159 en/live-snapshot.1:62

 msgid "I<live-tools>(7)"
 msgstr ""
 
 #. type: SH
 msgid "I<live-tools>(7)"
 msgstr ""
 
 #. type: SH

-#: en/live-boot.7:158 en/live-snapshot.1:63
+#: en/live-boot.7:160 en/live-snapshot.1:63

 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:160 en/live-snapshot.1:65
+#: en/live-boot.7:162 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 "
 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 "


@@ -823,13 +836,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
 msgstr ""
 
 #. type: SH

-#: en/live-boot.7:161 en/live-snapshot.1:66
+#: en/live-boot.7:163 en/live-snapshot.1:66

 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:163 en/live-snapshot.1:68
+#: en/live-boot.7:165 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 "
 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 @@ msgid ""
 msgstr ""
 
 #. type: SH
 msgstr ""
 
 #. type: SH

-#: en/live-boot.7:164 en/live-snapshot.1:69
+#: en/live-boot.7:166 en/live-snapshot.1:69

 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:165 en/live-snapshot.1:70
+#: en/live-boot.7:167 en/live-snapshot.1:70

 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<daniel@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 7251982..572409a 100644 (file)
--- 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"
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"

-"POT-Creation-Date: 2010-10-27 14:57+0300\n"
+"POT-Creation-Date: 2010-10-28 09:27+0300\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap

-msgid "2010-10-27"
+msgid "2010-10-28"

 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap

-msgid "3.0~a10"
+msgid "3.0~a11"

 msgstr ""
 
 #. type: TH
 msgstr ""
 
 #. type: TH


@@ -59,26 +59,26 @@ msgid "OPTIONS"
 msgstr ""
 
 #. type: IP
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:133 en/live-snapshot.1:43
+#: en/live-boot.7:135 en/live-snapshot.1:43

 #, no-wrap
 msgid "B</etc/live.conf>"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "B</etc/live.conf>"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:135 en/live-snapshot.1:45
+#: en/live-boot.7:137 en/live-snapshot.1:45

 msgid ""
 "Some variables can be configured via this config file (inside the live "
 "system)."
 msgstr ""
 
 #. type: IP
 msgid ""
 "Some variables can be configured via this config file (inside the live "
 "system)."
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:135 en/live-snapshot.1:45
+#: en/live-boot.7:137 en/live-snapshot.1:45

 #, no-wrap
 msgid "B<live/filesystem.module>"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "B<live/filesystem.module>"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:137 en/live-snapshot.1:47
+#: en/live-boot.7:139 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 \"/"
 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
 msgstr ""
 
 #. type: IP

-#: en/live-boot.7:137 en/live-snapshot.1:47
+#: en/live-boot.7:139 en/live-snapshot.1:47

 #, no-wrap
 msgid "B</etc/live-persistence.binds>"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "B</etc/live-persistence.binds>"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:139 en/live-snapshot.1:49
+#: en/live-boot.7:141 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. "
 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
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:142 en/live-snapshot.1:51
+#: en/live-boot.7:144 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 "
 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
 msgstr ""
 
 #. type: SH

-#: en/live-boot.7:143 en/live-snapshot.1:42
+#: en/live-boot.7:145 en/live-snapshot.1:42

 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: SH
 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: SH

-#: en/live-boot.7:149 en/live-snapshot.1:54
+#: en/live-boot.7:151 en/live-snapshot.1:54

 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:153 en/live-snapshot.1:58
+#: en/live-boot.7:155 en/live-snapshot.1:58

 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:155 en/live-snapshot.1:60
+#: en/live-boot.7:157 en/live-snapshot.1:60

 msgid "I<live-config>(7)"
 msgstr ""
 
 #. type: Plain text
 msgid "I<live-config>(7)"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:157 en/live-snapshot.1:62
+#: en/live-boot.7:159 en/live-snapshot.1:62

 msgid "I<live-tools>(7)"
 msgstr ""
 
 #. type: SH
 msgid "I<live-tools>(7)"
 msgstr ""
 
 #. type: SH

-#: en/live-boot.7:158 en/live-snapshot.1:63
+#: en/live-boot.7:160 en/live-snapshot.1:63

 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:160 en/live-snapshot.1:65
+#: en/live-boot.7:162 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 "
 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
 msgstr ""
 
 #. type: SH

-#: en/live-boot.7:161 en/live-snapshot.1:66
+#: en/live-boot.7:163 en/live-snapshot.1:66

 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:163 en/live-snapshot.1:68
+#: en/live-boot.7:165 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 "
 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
 msgstr ""
 
 #. type: SH

-#: en/live-boot.7:164 en/live-snapshot.1:69
+#: en/live-boot.7:166 en/live-snapshot.1:69

 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text

-#: en/live-boot.7:165 en/live-snapshot.1:70
+#: en/live-boot.7:167 en/live-snapshot.1:70

 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."

diff --git a/scripts/live b/scripts/live
index 5daec7f..c5f4d50 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -266,6 +266,16 @@ Arguments ()
                                export NOPERSISTENT
                                ;;
 
                                export NOPERSISTENT
                                ;;
 

+                       noprompt)
+                               NOPROMPT="Yes"
+                               export NOPROMPT
+                               ;;
+
+                       noprompt=*)
+                               NOPROMPT="${ARGUMENT#noprompt=}"
+                               export NOPROMPT
+                               ;;
+

                        quickusbmodules)
                                QUICKUSBMODULES="Yes"
                                export QUICKUSBMODULES
                        quickusbmodules)
                                QUICKUSBMODULES="Yes"
                                export QUICKUSBMODULES

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 0e9b0d0..b1883ff 100644 (file)
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -26,7 +26,7 @@ subdevices ()
        sysblock=${1}
        r=""
 
        sysblock=${1}
        r=""
 

-       for dev in "${sysblock}" "${sysblock}"/*
+       for dev in "${sysblock}"/* "${sysblock}"

        do
                if [ -e "${dev}/dev" ]
                then
        do
                if [ -e "${dev}/dev" ]
                then


@@ -297,13 +297,21 @@ find_cow_device ()
 
        for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
        do
 
        for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
        do

+               fulldevname=$(sys2dev "${sysblock}")
+
+               if echo "${black_listed_devices}" | grep -q -w "${fulldevname}"
+               then
+                       # skip this device entirely
+                       break
+               fi
+

                for dev in $(subdevices "${sysblock}")
                do
                        devname=$(sys2dev "${dev}")
 
                        if echo "${black_listed_devices}" | grep -q -w "${devname}"
                        then
                for dev in $(subdevices "${sysblock}")
                do
                        devname=$(sys2dev "${dev}")
 
                        if echo "${black_listed_devices}" | grep -q -w "${devname}"
                        then

-                               # skip this device enterely
+                               # skip this subdevice

                                break
                        fi
 
                                break
                        fi
 


@@ -383,6 +391,14 @@ find_files ()
 
        for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
        do
 
        for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
        do

+               fulldevname=$(sys2dev "${sysblock}")
+
+               if echo "${black_listed_devices}" | grep -q -w "${fulldevname}"
+               then
+                       # skip this device entirely
+                       break
+               fi
+

                for dev in $(subdevices "${sysblock}")
                do
                        devname=$(sys2dev "${dev}")
                for dev in $(subdevices "${sysblock}")
                do
                        devname=$(sys2dev "${dev}")


@@ -390,7 +406,7 @@ find_files ()
 
                        if echo "${black_listed_devices}" | grep -q -w "${devname}"
                        then
 
                        if echo "${black_listed_devices}" | grep -q -w "${devname}"
                        then

-                               # skip this device enterely
+                               # skip this subdevice

                                break
                        fi
 
                                break
                        fi