[SCM] live-boot branch, debian, updated. debian/2.0_a6-1-5-g21c9a47
Daniel Baumann
daniel at debian.org
Tue Jun 8 18:27:00 UTC 2010
The following commit has been merged in the debian branch:
commit 6c01f4c4938d114b9011db75a7006c724329f4c3
Author: Michal Suchanek <hramrach at centrum.cz>
Date: Tue Jun 8 15:58:50 2010 +0200
Document iscsi in the man page.
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 8f3abfc..9426cb8 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 2010\-06\-08 2.0~a6 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 08.06.2010 2.0~a6 "Debian Live Projekt"
.SH NAME
\fBlive\-boot\fP \- System Boot Skripte
@@ -80,6 +80,18 @@ a namebased virtualhost of an httpd if it is sharing the ip with the main
httpd instance.
.br
You may also use the live iso image in place of the squashfs image.
+.IP \fBiscsi\fP=\fIserver\-ip[,server\-port];target\-name\fP 4
+Boot from an iSCSI target that has an iso or disk live image as one of its
+LUNs. The specified target is searched for a LUN which looks like a live
+media. If you use the \fBiscsitarget\fP software iSCSI target solution which is
+packaged in Debian your ietd.conf might look like this:
+.br
+# The target\-name you specify in the iscsi= parameter
+.br
+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 \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 c4a1e90..42f1b85 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 2010\-06\-08 2.0~a6 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 08.06.2010 2.0~a6 "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 0a8ccb3..9097ca7 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -55,6 +55,15 @@ Working: http://1.2.3.4/path/to/your_filesystem.squashfs
Also note that therefore it's currently not possible to fetch an image from a namebased virtualhost of an httpd if it is sharing the ip with the main httpd instance.
.br
You may also use the live iso image in place of the squashfs image.
+.IP "\fBiscsi\fR=\fIserver-ip[,server-port];target-name\fR" 4
+Boot from an iSCSI target that has an iso or disk live image as one of its LUNs. The specified target is searched for a LUN which looks like a live media. If you use the \fBiscsitarget\fR software iSCSI target solution which is packaged in Debian your ietd.conf might look like this:
+.br
+# The target-name you specify in the iscsi= parameter
+.br
+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 "\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/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index 90e2ab1..a91c967 100644
--- a/manpages/po/de/live-boot.7.po
+++ b/manpages/po/de/live-boot.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot 2.0~a6\n"
-"POT-Creation-Date: 2010-06-08 06:01+0300\n"
+"POT-Creation-Date: 2010-06-08 16:12+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"
@@ -23,11 +23,13 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
+#, no-wrap
msgid "2010-06-08"
msgstr "08.06.2010"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
+#, no-wrap
msgid "2.0~a6"
msgstr "2.0~a6"
@@ -251,11 +253,41 @@ msgstr ""
#. type: IP
#: en/live-boot.7:58
#, no-wrap
+msgid "B<iscsi>=I<server-ip[,server-port];target-name>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:60
+msgid ""
+"Boot from an iSCSI target that has an iso or disk live image as one of its "
+"LUNs. The specified target is searched for a LUN which looks like a live "
+"media. If you use the B<iscsitarget> software iSCSI target solution which is "
+"packaged in Debian your ietd.conf might look like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:62
+msgid "# The target-name you specify in the iscsi= parameter"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:67
+#, no-wrap
+msgid ""
+"Target E<lt>target-nameE<gt>\n"
+" Lun 0 Path=E<lt>path-to-your-live-image.isoE<gt>,Type=fileio,IOMode=ro\n"
+" # If you want to boot multiple machines you might want to look at tuning some parameters like\n"
+" # Wthreads or MaxConnections\n"
+msgstr ""
+
+#. type: IP
+#: en/live-boot.7:67
+#, no-wrap
msgid "B<ignore_uuid>"
msgstr "B<ignore_uuid>"
#. type: Plain text
-#: en/live-boot.7:60
+#: en/live-boot.7:69
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 "
@@ -263,13 +295,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:60
+#: en/live-boot.7:69
#, no-wrap
msgid "B<integrity-check>"
msgstr "B<integrity-check>"
#. type: Plain text
-#: en/live-boot.7:62
+#: en/live-boot.7:71
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 "
@@ -277,13 +309,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:62
+#: en/live-boot.7:71
#, 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:64
+#: en/live-boot.7:73
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 "
@@ -293,13 +325,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:64
+#: en/live-boot.7:73
#, no-wrap
msgid "B<ip>=[I<frommedia>]"
msgstr "B<ip>=[I<frommedia>]"
#. type: Plain text
-#: en/live-boot.7:66
+#: en/live-boot.7:75
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/"
@@ -307,13 +339,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:66
+#: en/live-boot.7:75
#, 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:68
+#: en/live-boot.7:77
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 "
@@ -322,7 +354,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:70
+#: en/live-boot.7:79
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. "
@@ -331,13 +363,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:70
+#: en/live-boot.7:79
#, 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:72
+#: en/live-boot.7:81
msgid ""
"live-boot will mount the encrypted rootfs TYPE, asking the passphrase, "
"useful to build paranoid live systems :-). TYPE supported so far are \"aes\" "
@@ -345,13 +377,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:72
+#: en/live-boot.7:81
#, no-wrap
msgid "B<live-media-offset>=I<BYTES>"
msgstr "B<live-media-offset>=I<BYTES>"
#. type: Plain text
-#: en/live-boot.7:74
+#: en/live-boot.7:83
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 "
@@ -360,13 +392,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:74
+#: en/live-boot.7:83
#, no-wrap
msgid "B<live-media-path>=I<PATH>"
msgstr "B<live-media-path>=I<PATH>"
#. type: Plain text
-#: en/live-boot.7:76
+#: en/live-boot.7:85
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 "
@@ -374,26 +406,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:76
+#: en/live-boot.7:85
#, no-wrap
msgid "B<live-media-timeout>=I<SECONDS>"
msgstr "B<live-media-timeout>=I<SECONDS>"
#. type: Plain text
-#: en/live-boot.7:78
+#: en/live-boot.7:87
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:78
+#: en/live-boot.7:87
#, no-wrap
msgid "B<module>=I<NAME>"
msgstr "B<module>=I<NAME>"
#. type: Plain text
-#: en/live-boot.7:80
+#: en/live-boot.7:89
msgid ""
"Instead of using the default optional file \"filesystem.module\" (see below) "
"another file could be specified without the extension \".module\"; it should "
@@ -401,13 +433,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:80
+#: en/live-boot.7:89
#, no-wrap
msgid "B<netboot>[=nfs|cifs]"
msgstr "B<netboot>[=nfs|cifs]"
#. type: Plain text
-#: en/live-boot.7:82
+#: en/live-boot.7:91
msgid ""
"This tells live-boot to perform a network mount. The parameter \"nfsroot="
"\" (with optional \"nfsopts=\"), should specify where is the location of the "
@@ -415,24 +447,24 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:82
+#: en/live-boot.7:91
#, no-wrap
msgid "B<nfsopts>="
msgstr "B<nfsopts>="
#. type: Plain text
-#: en/live-boot.7:84
+#: en/live-boot.7:93
msgid "This lets you specify custom nfs options."
msgstr ""
#. type: IP
-#: en/live-boot.7:84
+#: en/live-boot.7:93
#, no-wrap
msgid "B<nofastboot>"
msgstr "B<nofastboot>"
#. type: Plain text
-#: en/live-boot.7:86
+#: en/live-boot.7:95
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 "
@@ -440,48 +472,48 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:86
+#: en/live-boot.7:95
#, no-wrap
msgid "B<nopersistent>"
msgstr "B<nopersistent>"
#. type: Plain text
-#: en/live-boot.7:88
+#: en/live-boot.7:97
msgid ""
"disables the \"persistent\" feature, useful if the bootloader (like "
"syslinux) has been installed with persistent enabled."
msgstr ""
#. type: IP
-#: en/live-boot.7:88
+#: en/live-boot.7:97
#, no-wrap
msgid "B<noprompt>"
msgstr "B<noprompt>"
#. type: Plain text
-#: en/live-boot.7:90
+#: en/live-boot.7:99
msgid "Do not prompt to eject the CD or remove the USB flash drive on reboot."
msgstr ""
#. type: IP
-#: en/live-boot.7:90
+#: en/live-boot.7:99
#, no-wrap
msgid "B<swapon>"
msgstr "B<swapon>"
#. type: Plain text
-#: en/live-boot.7:92
+#: en/live-boot.7:101
msgid "This parameter enables usage of local swap partitions."
msgstr ""
#. type: IP
-#: en/live-boot.7:92
+#: en/live-boot.7:101
#, no-wrap
msgid "B<noxautoconfig>"
msgstr "B<noxautoconfig>"
#. type: Plain text
-#: en/live-boot.7:94
+#: en/live-boot.7:103
msgid ""
"This parameter disables Xorg auto-reconfiguration at boot time. This is "
"valuable if you either do the detection on your own, or, if you want to ship "
@@ -489,13 +521,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:94
+#: en/live-boot.7:103
#, no-wrap
msgid "B<persistent>[=nofiles]"
msgstr "B<persistent>[=nofiles]"
#. type: Plain text
-#: en/live-boot.7:96
+#: 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 "
@@ -509,13 +541,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:96
+#: 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:98
+#: 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 "
@@ -523,26 +555,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:98
+#: 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:100
+#: 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:100
+#: 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:102
+#: 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 "
@@ -550,26 +582,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:102
+#: en/live-boot.7:111
#, no-wrap
msgid "B<quickreboot>"
msgstr "B<quickreboot>"
#. type: Plain text
-#: en/live-boot.7:104
+#: 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:104
+#: en/live-boot.7:113
#, no-wrap
msgid "B<showmounts>"
msgstr "B<showmounts>"
#. type: Plain text
-#: en/live-boot.7:106
+#: 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 "
@@ -578,38 +610,38 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:106
+#: en/live-boot.7:115
#, no-wrap
msgid "B<silent>"
msgstr "B<silent>"
#. type: Plain text
-#: en/live-boot.7:108
+#: 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:108
+#: en/live-boot.7:117
#, no-wrap
msgid "B<textonly>"
msgstr "B<textonly>"
#. type: Plain text
-#: en/live-boot.7:110
+#: en/live-boot.7:119
msgid ""
"Start up to text-mode shell prompts, disabling the graphical user interface."
msgstr ""
#. type: IP
-#: en/live-boot.7:110
+#: en/live-boot.7:119
#, no-wrap
msgid "B<todisk>=I<DEVICE>"
msgstr "B<todisk>=I<DEVICE>"
#. type: Plain text
-#: en/live-boot.7:112
+#: en/live-boot.7:121
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 +651,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:112
+#: en/live-boot.7:121
#, no-wrap
msgid "B<toram>"
msgstr "B<toram>"
#. type: Plain text
-#: en/live-boot.7:114
+#: en/live-boot.7:123
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,71 +665,71 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:114
+#: en/live-boot.7:123
#, no-wrap
msgid "B<union>=aufs|unionfs"
msgstr "B<union>=aufs|unionfs"
#. type: Plain text
-#: en/live-boot.7:116
+#: en/live-boot.7:125
msgid ""
"By default, live-boot uses aufs. With this parameter, you can switch to "
"unionfs."
msgstr ""
#. type: IP
-#: en/live-boot.7:116
+#: en/live-boot.7:125
#, no-wrap
msgid "B<xdebconf>"
msgstr "B<xdebconf>"
#. type: Plain text
-#: en/live-boot.7:118
+#: en/live-boot.7:127
msgid ""
"Uses xdebconfigurator, if present on the rootfs, to configure X instead of "
"the standard procedure (experimental)."
msgstr ""
#. type: IP
-#: en/live-boot.7:118
+#: en/live-boot.7:127
#, no-wrap
msgid "B<xvideomode>=I<RESOLUTION>"
msgstr "B<xvideomode>=I<RESOLUTION>"
#. FIXME
#. type: Plain text
-#: en/live-boot.7:121
+#: en/live-boot.7:130
msgid "Doesn't do xorg autodetection, but enforces a given resolution."
msgstr ""
#. FIXME
#. type: SH
-#: en/live-boot.7:123
+#: en/live-boot.7:132
#, no-wrap
msgid "FILES (old)"
msgstr ""
#. type: IP
-#: en/live-boot.7:124 en/live-snapshot.1:43
+#: en/live-boot.7:133 en/live-snapshot.1:43
#, no-wrap
msgid "B</etc/live.conf>"
msgstr "B</etc/live.conf>"
#. type: Plain text
-#: en/live-boot.7:126 en/live-snapshot.1:45
+#: en/live-boot.7:135 en/live-snapshot.1:45
msgid ""
"Some variables can be configured via this config file (inside the live "
"system)."
msgstr ""
#. type: IP
-#: en/live-boot.7:126 en/live-snapshot.1:45
+#: en/live-boot.7:135 en/live-snapshot.1:45
#, no-wrap
msgid "B<live/filesystem.module>"
msgstr "B<live/filesystem.module>"
#. type: Plain text
-#: en/live-boot.7:128 en/live-snapshot.1:47
+#: en/live-boot.7:137 en/live-snapshot.1:47
msgid ""
"This optional file (inside the live media) contains a list of white-space or "
"carriage-return-separated file names corresponding to disk images in the \"/"
@@ -710,13 +742,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:128 en/live-snapshot.1:47
+#: en/live-boot.7:137 en/live-snapshot.1:47
#, no-wrap
msgid "B</etc/live-persistence.binds>"
msgstr "B</etc/live-persistence.binds>"
#. type: Plain text
-#: en/live-boot.7:130 en/live-snapshot.1:49
+#: en/live-boot.7:139 en/live-snapshot.1:49
msgid ""
"This optional file (which resides in the rootfs system, not in the live "
"media) is used as a list of directories which not need be persistent: ie. "
@@ -725,7 +757,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:133 en/live-snapshot.1:51
+#: en/live-boot.7:142 en/live-snapshot.1:51
msgid ""
"This saves expensive writes and speeds up operations on volatile data such "
"as web caches and temporary files (like e.g. /tmp and .mozilla) which are "
@@ -734,64 +766,64 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:134 en/live-snapshot.1:42
+#: en/live-boot.7:143 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr "DATEIEN"
#. type: IP
-#: en/live-boot.7:135
+#: en/live-boot.7:144
#, no-wrap
msgid "B</etc/live/boot.conf>"
msgstr "B</etc/live/boot.conf>"
#. type: IP
-#: en/live-boot.7:136
+#: en/live-boot.7:145
#, no-wrap
msgid "B</etc/live/boot.conf.d/>"
msgstr "B</etc/live/boot.conf.d/>"
#. type: IP
-#: en/live-boot.7:137
+#: en/live-boot.7:146
#, no-wrap
msgid "B<live/boot.conf>"
msgstr "B<live/boot.conf>"
#. type: IP
-#: en/live-boot.7:138
+#: en/live-boot.7:147
#, no-wrap
msgid "B<live/boot.conf.d/>"
msgstr "B<live/boot.conf.d/>"
#. type: SH
-#: en/live-boot.7:140 en/live-snapshot.1:52
+#: en/live-boot.7:149 en/live-snapshot.1:52
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-boot.7:142
+#: en/live-boot.7:151
msgid "I<live-snapshot>(1)"
msgstr "I<live-snapshot>(1)"
#. type: Plain text
-#: en/live-boot.7:144 en/live-snapshot.1:56
+#: en/live-boot.7:153 en/live-snapshot.1:56
msgid "I<live-config>(7)"
msgstr "I<live-config>(7)"
#. type: Plain text
-#: en/live-boot.7:146 en/live-snapshot.1:58
+#: en/live-boot.7:155 en/live-snapshot.1:58
msgid "I<live-helper>(7)"
msgstr "I<live-helper>(7)"
#. type: SH
-#: en/live-boot.7:147 en/live-snapshot.1:59
+#: en/live-boot.7:156 en/live-snapshot.1:59
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-boot.7:149 en/live-snapshot.1:61
+#: en/live-boot.7:158 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 "
@@ -802,13 +834,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-boot.7:150 en/live-snapshot.1:62
+#: en/live-boot.7:159 en/live-snapshot.1:62
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-boot.7:152 en/live-snapshot.1:64
+#: en/live-boot.7:161 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 "
@@ -822,13 +854,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-boot.7:153 en/live-snapshot.1:65
+#: en/live-boot.7:162 en/live-snapshot.1:65
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-boot.7:154 en/live-snapshot.1:66
+#: en/live-boot.7:163 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 ba9f43b..e60c679 100644
--- a/manpages/po/de/live-snapshot.1.po
+++ b/manpages/po/de/live-snapshot.1.po
@@ -23,11 +23,13 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
+#, no-wrap
msgid "2010-06-08"
msgstr "08.06.2010"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
+#, no-wrap
msgid "2.0~a6"
msgstr "2.0~a6"
diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 372b391..a129f08 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-06-08 06:01+0300\n"
+"POT-Creation-Date: 2010-06-08 16:12+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"
@@ -247,25 +247,55 @@ msgstr ""
#. type: IP
#: en/live-boot.7:58
#, no-wrap
-msgid "B<ignore_uuid>"
+msgid "B<iscsi>=I<server-ip[,server-port];target-name>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:60
msgid ""
+"Boot from an iSCSI target that has an iso or disk live image as one of its "
+"LUNs. The specified target is searched for a LUN which looks like a live "
+"media. If you use the B<iscsitarget> software iSCSI target solution which is "
+"packaged in Debian your ietd.conf might look like this:"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:62
+msgid "# The target-name you specify in the iscsi= parameter"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:67
+#, no-wrap
+msgid ""
+"Target E<lt>target-nameE<gt>\n"
+" Lun 0 Path=E<lt>path-to-your-live-image.isoE<gt>,Type=fileio,IOMode=ro\n"
+" # If you want to boot multiple machines you might want to look at tuning some parameters like\n"
+" # Wthreads or MaxConnections\n"
+msgstr ""
+
+#. type: IP
+#: en/live-boot.7:67
+#, no-wrap
+msgid "B<ignore_uuid>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:69
+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:60
+#: en/live-boot.7:69
#, no-wrap
msgid "B<integrity-check>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:62
+#: en/live-boot.7:71
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 "
@@ -273,13 +303,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:62
+#: en/live-boot.7:71
#, 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:64
+#: en/live-boot.7:73
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 "
@@ -289,13 +319,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:64
+#: en/live-boot.7:73
#, no-wrap
msgid "B<ip>=[I<frommedia>]"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:66
+#: en/live-boot.7:75
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/"
@@ -303,13 +333,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:66
+#: en/live-boot.7:75
#, no-wrap
msgid "{B<live-media>|B<bootfrom>}=I<DEVICE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:68
+#: en/live-boot.7:77
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 "
@@ -318,7 +348,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:70
+#: en/live-boot.7:79
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. "
@@ -327,13 +357,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:70
+#: en/live-boot.7:79
#, no-wrap
msgid "{B<live-media-encryption>|B<encryption>}=I<TYPE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:72
+#: en/live-boot.7:81
msgid ""
"live-boot will mount the encrypted rootfs TYPE, asking the passphrase, "
"useful to build paranoid live systems :-). TYPE supported so far are \"aes\" "
@@ -341,13 +371,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:72
+#: en/live-boot.7:81
#, no-wrap
msgid "B<live-media-offset>=I<BYTES>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:74
+#: en/live-boot.7:83
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 "
@@ -356,13 +386,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:74
+#: en/live-boot.7:83
#, no-wrap
msgid "B<live-media-path>=I<PATH>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:76
+#: en/live-boot.7:85
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 "
@@ -370,26 +400,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:76
+#: en/live-boot.7:85
#, no-wrap
msgid "B<live-media-timeout>=I<SECONDS>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:78
+#: en/live-boot.7:87
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:78
+#: en/live-boot.7:87
#, no-wrap
msgid "B<module>=I<NAME>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:80
+#: en/live-boot.7:89
msgid ""
"Instead of using the default optional file \"filesystem.module\" (see below) "
"another file could be specified without the extension \".module\"; it should "
@@ -397,13 +427,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:80
+#: en/live-boot.7:89
#, no-wrap
msgid "B<netboot>[=nfs|cifs]"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:82
+#: en/live-boot.7:91
msgid ""
"This tells live-boot to perform a network mount. The parameter \"nfsroot="
"\" (with optional \"nfsopts=\"), should specify where is the location of the "
@@ -411,24 +441,24 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:82
+#: en/live-boot.7:91
#, no-wrap
msgid "B<nfsopts>="
msgstr ""
#. type: Plain text
-#: en/live-boot.7:84
+#: en/live-boot.7:93
msgid "This lets you specify custom nfs options."
msgstr ""
#. type: IP
-#: en/live-boot.7:84
+#: en/live-boot.7:93
#, no-wrap
msgid "B<nofastboot>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:86
+#: en/live-boot.7:95
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 "
@@ -436,48 +466,48 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:86
+#: en/live-boot.7:95
#, no-wrap
msgid "B<nopersistent>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:88
+#: en/live-boot.7:97
msgid ""
"disables the \"persistent\" feature, useful if the bootloader (like "
"syslinux) has been installed with persistent enabled."
msgstr ""
#. type: IP
-#: en/live-boot.7:88
+#: en/live-boot.7:97
#, no-wrap
msgid "B<noprompt>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:90
+#: en/live-boot.7:99
msgid "Do not prompt to eject the CD or remove the USB flash drive on reboot."
msgstr ""
#. type: IP
-#: en/live-boot.7:90
+#: en/live-boot.7:99
#, no-wrap
msgid "B<swapon>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:92
+#: en/live-boot.7:101
msgid "This parameter enables usage of local swap partitions."
msgstr ""
#. type: IP
-#: en/live-boot.7:92
+#: en/live-boot.7:101
#, no-wrap
msgid "B<noxautoconfig>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:94
+#: en/live-boot.7:103
msgid ""
"This parameter disables Xorg auto-reconfiguration at boot time. This is "
"valuable if you either do the detection on your own, or, if you want to ship "
@@ -485,13 +515,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:94
+#: en/live-boot.7:103
#, no-wrap
msgid "B<persistent>[=nofiles]"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:96
+#: 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 "
@@ -505,13 +535,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:96
+#: en/live-boot.7:105
#, no-wrap
msgid "B<persistent-path>=I<PATH>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:98
+#: 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 "
@@ -519,26 +549,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:98
+#: en/live-boot.7:107
#, no-wrap
msgid "{B<preseed/file>|B<file>}=I<FILE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:100
+#: 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:100
+#: en/live-boot.7:109
#, no-wrap
msgid "B<package/question>=I<VALUE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:102
+#: 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 "
@@ -546,26 +576,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:102
+#: en/live-boot.7:111
#, no-wrap
msgid "B<quickreboot>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:104
+#: 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:104
+#: en/live-boot.7:113
#, no-wrap
msgid "B<showmounts>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:106
+#: 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 "
@@ -574,38 +604,38 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:106
+#: en/live-boot.7:115
#, no-wrap
msgid "B<silent>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:108
+#: 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:108
+#: en/live-boot.7:117
#, no-wrap
msgid "B<textonly>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:110
+#: en/live-boot.7:119
msgid ""
"Start up to text-mode shell prompts, disabling the graphical user interface."
msgstr ""
#. type: IP
-#: en/live-boot.7:110
+#: en/live-boot.7:119
#, no-wrap
msgid "B<todisk>=I<DEVICE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:112
+#: en/live-boot.7:121
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 "
@@ -615,13 +645,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:112
+#: en/live-boot.7:121
#, no-wrap
msgid "B<toram>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:114
+#: en/live-boot.7:123
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 "
@@ -629,71 +659,71 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:114
+#: en/live-boot.7:123
#, no-wrap
msgid "B<union>=aufs|unionfs"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:116
+#: en/live-boot.7:125
msgid ""
"By default, live-boot uses aufs. With this parameter, you can switch to "
"unionfs."
msgstr ""
#. type: IP
-#: en/live-boot.7:116
+#: en/live-boot.7:125
#, no-wrap
msgid "B<xdebconf>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:118
+#: en/live-boot.7:127
msgid ""
"Uses xdebconfigurator, if present on the rootfs, to configure X instead of "
"the standard procedure (experimental)."
msgstr ""
#. type: IP
-#: en/live-boot.7:118
+#: en/live-boot.7:127
#, no-wrap
msgid "B<xvideomode>=I<RESOLUTION>"
msgstr ""
#. FIXME
#. type: Plain text
-#: en/live-boot.7:121
+#: en/live-boot.7:130
msgid "Doesn't do xorg autodetection, but enforces a given resolution."
msgstr ""
#. FIXME
#. type: SH
-#: en/live-boot.7:123
+#: en/live-boot.7:132
#, no-wrap
msgid "FILES (old)"
msgstr ""
#. type: IP
-#: en/live-boot.7:124 en/live-snapshot.1:43
+#: en/live-boot.7:133 en/live-snapshot.1:43
#, no-wrap
msgid "B</etc/live.conf>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:126 en/live-snapshot.1:45
+#: en/live-boot.7:135 en/live-snapshot.1:45
msgid ""
"Some variables can be configured via this config file (inside the live "
"system)."
msgstr ""
#. type: IP
-#: en/live-boot.7:126 en/live-snapshot.1:45
+#: en/live-boot.7:135 en/live-snapshot.1:45
#, no-wrap
msgid "B<live/filesystem.module>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:128 en/live-snapshot.1:47
+#: en/live-boot.7:137 en/live-snapshot.1:47
msgid ""
"This optional file (inside the live media) contains a list of white-space or "
"carriage-return-separated file names corresponding to disk images in the \"/"
@@ -706,13 +736,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:128 en/live-snapshot.1:47
+#: en/live-boot.7:137 en/live-snapshot.1:47
#, no-wrap
msgid "B</etc/live-persistence.binds>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:130 en/live-snapshot.1:49
+#: en/live-boot.7:139 en/live-snapshot.1:49
msgid ""
"This optional file (which resides in the rootfs system, not in the live "
"media) is used as a list of directories which not need be persistent: ie. "
@@ -721,7 +751,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:133 en/live-snapshot.1:51
+#: en/live-boot.7:142 en/live-snapshot.1:51
msgid ""
"This saves expensive writes and speeds up operations on volatile data such "
"as web caches and temporary files (like e.g. /tmp and .mozilla) which are "
@@ -730,64 +760,64 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:134 en/live-snapshot.1:42
+#: en/live-boot.7:143 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/live-boot.7:135
+#: en/live-boot.7:144
#, no-wrap
msgid "B</etc/live/boot.conf>"
msgstr ""
#. type: IP
-#: en/live-boot.7:136
+#: en/live-boot.7:145
#, no-wrap
msgid "B</etc/live/boot.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-boot.7:137
+#: en/live-boot.7:146
#, no-wrap
msgid "B<live/boot.conf>"
msgstr ""
#. type: IP
-#: en/live-boot.7:138
+#: en/live-boot.7:147
#, no-wrap
msgid "B<live/boot.conf.d/>"
msgstr ""
#. type: SH
-#: en/live-boot.7:140 en/live-snapshot.1:52
+#: en/live-boot.7:149 en/live-snapshot.1:52
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:142
+#: en/live-boot.7:151
msgid "I<live-snapshot>(1)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:144 en/live-snapshot.1:56
+#: en/live-boot.7:153 en/live-snapshot.1:56
msgid "I<live-config>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:146 en/live-snapshot.1:58
+#: en/live-boot.7:155 en/live-snapshot.1:58
msgid "I<live-helper>(7)"
msgstr ""
#. type: SH
-#: en/live-boot.7:147 en/live-snapshot.1:59
+#: en/live-boot.7:156 en/live-snapshot.1:59
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:149 en/live-snapshot.1:61
+#: en/live-boot.7:158 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 "
@@ -795,13 +825,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:150 en/live-snapshot.1:62
+#: en/live-boot.7:159 en/live-snapshot.1:62
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:152 en/live-snapshot.1:64
+#: en/live-boot.7:161 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 "
@@ -810,13 +840,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:153 en/live-snapshot.1:65
+#: en/live-boot.7:162 en/live-snapshot.1:65
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:154 en/live-snapshot.1:66
+#: en/live-boot.7:163 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