Adding upstream version 4.0~a11.

diff --git a/VERSION b/VERSION
index c5a2bb6..f7d9b10 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0~a10-1
+4.0~a11-1

diff --git a/backends/dracut/live.script b/backends/dracut/live.script
index 2f29e70..223f355 100755 (executable)
--- a/backends/dracut/live.script
+++ b/backends/dracut/live.script
@@ -7,5 +7,5 @@
 DRACUT_FIXME ()
 {
        # dracut entry point for live-boot is FIXME(); function
-       Main
+       Live
 }

diff --git a/backends/initramfs-tools/live.script b/backends/initramfs-tools/live.script
index 1c6ebbf..9646274 100755 (executable)
--- a/backends/initramfs-tools/live.script
+++ b/backends/initramfs-tools/live.script
@@ -9,5 +9,5 @@
 mountroot ()
 {
        # initramfs-tools entry point for live-boot is mountroot(); function
-       Main
+       Live
 }

diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 01c06f3..9508d9b 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.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 01.04.2013 4.0~a10\-1 "Live Systems Project"
+.TH LIVE\-BOOT 7 06.05.2013 4.0~a11\-1 "Live Systems Project"
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Scripts

diff --git a/manpages/de/persistence.conf.de.5 b/manpages/de/persistence.conf.de.5
index ec78a84..c134248 100644 (file)
--- a/manpages/de/persistence.conf.de.5
+++ b/manpages/de/persistence.conf.de.5
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 01.04.2013 4.0~a10\-1 "Live Systems Project"
+.TH LIVE\-BOOT conf 06.05.2013 4.0~a11\-1 "Live Systems Project"
 
 .SH NAME
 \fBpersistence.conf\fP \- Configuration file for persistence media in live\-boot

diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index a91d714..c323cf4 100644 (file)
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2013\-04\-01 4.0~a10-1 "Live Systems Project"
+.TH LIVE\-BOOT 7 2013\-05\-06 4.0~a11-1 "Live Systems Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts

diff --git a/manpages/en/persistence.conf.5 b/manpages/en/persistence.conf.5
index 86e1430..698b079 100644 (file)
--- a/manpages/en/persistence.conf.5
+++ b/manpages/en/persistence.conf.5
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2013\-04\-01 4.0~a10-1 "Live Systems Project"
+.TH LIVE\-BOOT conf 2013\-05\-06 4.0~a11-1 "Live Systems Project"
 
 .SH NAME
 \fBpersistence.conf\fR \- Configuration file for persistence media in

diff --git a/manpages/es/live-boot.es.7 b/manpages/es/live-boot.es.7
index e713f5d..48ff6f2 100644 (file)
--- a/manpages/es/live-boot.es.7
+++ b/manpages/es/live-boot.es.7
@@ -3,26 +3,27 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 01.04.2013 4.0~a10\-1 "Live Systems Project"
+.TH LIVE\-BOOT 7 06.05.2013 4.0~a11\-1 "Proyecto Live Systems"
 
 .SH NOMBRE
 \fBlive\-boot\fP \- Scripts de Arranque del Sistema
 
 .SH DESCRIPCIÓN
-\fBlive\-boot\fP contains the scripts that configure a live system during the
-boot process (early userspace).
+\fBlive\-boot\fP contiene los scripts que configuran un sistema en vivo durante
+el proceso de arranque (early userspace).
 .PP
 .\" FIXME
-live\-boot is a hook for the initramfs\-tools, used to generate a initramfs
-capable to boot live systems, such as those created by
-\fIlive\-helper\fP(7). This includes the Live systems ISOs, netboot tarballs,
-and usb stick images.
+live\-boot es un hook para initramfs\-tools, usado para generar un initramfs
+capaz de arrancar sistemas en vivo, tales como los creados por
+\fIlive\-helper\fP(7). Esto incluye las ISOs de Live Systems, netboot tarballs y
+las imágenes para llaves usb.
 .PP
 .\" FIXME
-At boot time it will look for a (read\-only) media containing a "/live"
-directory where a root filesystems (often a compressed filesystem image like
-squashfs) is stored. If found, it will create a writable environment, using
-aufs, to boot the system from.
+En el momento del arranque se buscará un dispositivo de sólo lectura que
+contenga un directorio "/live" dónde se almacena un sistema de ficheros raíz
+(a menudo se trata de una imagen comprimida de un sistema de ficheros como
+squashfs). Si live\-boot lo encuentra, creará un entorno de escritura, usando
+aufs, a partir del cual pueda arrancar un sistema.
 
 .SH CONFIGURACIÓN
 \fBlive\-boot\fP se puede configurar mediante un parámetro de arranque o un
@@ -88,10 +89,10 @@ compartiendo la ip con la instancia principal httpd.
 También se puede utilizar la imagen iso en vivo en lugar de la imagen
 squashfs.
 .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 your
-ietd.conf might look like this:
+Arranca desde un iSCSI que tiene una iso o una imagen de disco en vivo como
+uno de sus LUNs. Se busca en el objetivo especificado un LUN que sea similar
+a un medio en vivo. Si se utiliza el software de iSCSI \fBiscsitarget\fP el
+ietd.conf podría ser similar al siguiente:
 .br
 # El nombre de destino se especifica en el parámetro iscsi=
 .br
@@ -141,10 +142,10 @@ live\-boot montará el TYPE rotfs cifrado,  pidiendo la contraseña. Es útil
 para crear sistemas en vivo paranoicos :\-) Hasta el momento el TYPE
 soportado es "aes" para cifrado loop\-aes.
 .IP \fBlive\-media\-offset\fP=\fIBYTES\fP 4
-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
-the live system ISO or image inside another iso or image, to create "clean"
-images.
+De esta manera se puede especificar a live\-boot que la imagen comienza en
+BYTES en el dispositivo anteriormente especificado, o auto\-descubierto, esto
+podría ser útil para esconder la iso o la imagen dentro de otra iso o
+imagen, para crear imágenes "limpias".
 .IP \fBlive\-media\-path\fP=\fIPATH\fP 4
 Establece la ruta de acceso al sistema de ficheros en vivo en el medio. De
 forma predeterminada está en '/live' y no se debe cambiar a menos que se
@@ -286,15 +287,17 @@ alfanumérico.
 \fIlive\-tools\fP(7)
 
 .SH "PÁGINA WEB"
-More information about live\-boot and the Live Systems project can be found
-on the homepage at <\fIhttp://live\-systems.org/\fP> and in the manual
-at <\fIhttp://live\-systems.org/manual/\fP>.
+Se puede encontrar más información acerca de live\-boot y el proyecto Live
+Systems en la página web <\fIhttp://live\-systems.org/\fP> y en el
+manual en <\fIhttp://live\-systems.org/manual/\fP>.
 
 .SH ERRORES
-Bugs can be reported by submitting a bugreport for the live\-boot package in
-the Bug Tracking System at <\fIhttp://bugs.debian.org/\fP> or by
-writing a mail to the Live Systems mailing list at
+Se puede notificar los fallos enviando un informe de errores sobre el
+paquete live\-boot al Sistema de Seguimiento de Errores en
+<\fIhttp://bugs.debian.org/\fP> o escribiendo un mensaje a la lista de
+correo de Live Systems a la dirección
 <\fIdebian\-live@lists.debian.org\fP>.
 
 .SH AUTOR
-live\-boot was written by Daniel Baumann <\fImail@daniel\-baumann.ch\fP>.
+live\-boot fue escrito por Daniel Baumann
+<\fImail@daniel\-baumann.ch\fP>.

diff --git a/manpages/es/persistence.conf.es.5 b/manpages/es/persistence.conf.es.5
index f92f2be..92ef054 100644 (file)
--- a/manpages/es/persistence.conf.es.5
+++ b/manpages/es/persistence.conf.es.5
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 01.04.2013 4.0~a10\-1 "Live Systems Project"
+.TH LIVE\-BOOT conf 06.05.2013 4.0~a11\-1 "Proyecto Live Systems"
 
 .SH NOMBRE
 \fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con
@@ -209,15 +209,17 @@ tendría que ser copiado en \fIVOL\fP/usr durante la preinstalación inicial.
 \fIlive\-tools\fP(7)
 
 .SH "PÁGINA WEB"
-More information about live\-boot and the Live Systems project can be found
-on the homepage at <\fIhttp://live\-systems.org/\fP> and in the manual
-at <\fIhttp://live\-systems.org/manual/\fP>.
+Se puede encontrar más información acerca de live\-boot y el proyecto Live
+Systems en la página web <\fIhttp://live\-systems.org/\fP> y en el
+manual en <\fIhttp://live\-systems.org/manual/\fP>.
 
 .SH ERRORES
-Bugs can be reported by submitting a bugreport for the live\-boot package in
-the Bug Tracking System at <\fIhttp://bugs.debian.org/\fP> or by
-writing a mail to the Live Systems mailing list at
+Se puede notificar los fallos enviando un informe de errores sobre el
+paquete live\-boot al Sistema de Seguimiento de Errores en
+<\fIhttp://bugs.debian.org/\fP> o escribiendo un mensaje a la lista de
+correo de Live Systems a la dirección
 <\fIdebian\-live@lists.debian.org\fP>.
 
 .SH AUTOR
-live\-boot was written by Daniel Baumann <\fImail@daniel\-baumann.ch\fP>.
+live\-boot fue escrito por Daniel Baumann
+<\fImail@daniel\-baumann.ch\fP>.

diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index dd1cfaa..00faf05 100644 (file)
--- a/manpages/po/de/live-boot.7.po
+++ b/manpages/po/de/live-boot.7.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0~a10-1\n"
-"POT-Creation-Date: 2013-04-01 08:19+0300\n"
-"PO-Revision-Date: 2012-04-08 22:48+0300\n"
-"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
+"Project-Id-Version: live-boot 4.0~a11-1\n"
+"POT-Creation-Date: 2013-05-06 14:23+0300\n"
+"PO-Revision-Date: 2013-04-13 16:48+0100\n"
+"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -24,14 +24,14 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-04-01"
-msgstr "01.04.2013"
+msgid "2013-05-06"
+msgstr "06.05.2013"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a10-1"
-msgstr "4.0~a10-1"
+msgid "4.0~a11-1"
+msgstr "4.0~a11-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1

diff --git a/manpages/po/de/persistence.conf.5.po b/manpages/po/de/persistence.conf.5.po
index 13e7afd..63b0b03 100644 (file)
--- a/manpages/po/de/persistence.conf.5.po
+++ b/manpages/po/de/persistence.conf.5.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0~a10-1\n"
-"POT-Creation-Date: 2013-04-01 08:19+0300\n"
-"PO-Revision-Date: 2012-04-08 22:48+0300\n"
-"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
+"Project-Id-Version: live-boot 4.0~a11-1\n"
+"POT-Creation-Date: 2013-05-06 14:23+0300\n"
+"PO-Revision-Date: 2013-04-13 16:48+0100\n"
+"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -24,14 +24,14 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-04-01"
-msgstr "01.04.2013"
+msgid "2013-05-06"
+msgstr "06.05.2013"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a10-1"
-msgstr "4.0~a10-1"
+msgid "4.0~a11-1"
+msgstr "4.0~a11-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1

diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po
index e2d5abd..c05cd2f 100644 (file)
--- a/manpages/po/es/live-boot.7.po
+++ b/manpages/po/es/live-boot.7.po
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0~a10-1\n"
-"POT-Creation-Date: 2013-04-01 08:19+0300\n"
-"PO-Revision-Date: 2013-02-12 14:25+0100\n"
+"Project-Id-Version: live-boot 4.0~a11-1\n"
+"POT-Creation-Date: 2013-05-06 14:23+0300\n"
+"PO-Revision-Date: 2013-04-13 22:38+0100\n"
 "Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
 "Language-Team: none\n"
 "Language: es\n"
@@ -24,20 +24,20 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-04-01"
-msgstr "01.04.2013"
+msgid "2013-05-06"
+msgstr "06.05.2013"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a10-1"
-msgstr "4.0~a10-1"
+msgid "4.0~a11-1"
+msgstr "4.0~a11-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "Live Systems Project"
-msgstr "Proyecto Debian Live"
+msgstr "Proyecto Live Systems"
 
 #. type: SH
 #: en/live-boot.7:3 en/persistence.conf.5:3
@@ -58,26 +58,16 @@ msgstr "DESCRIPCIÓN"
 
 #. type: Plain text
 #: en/live-boot.7:8
-#, fuzzy
-#| msgid ""
-#| "B<live-boot> contains the scripts that configure a Debian Live system "
-#| "during the boot process (early userspace)."
 msgid ""
 "B<live-boot> contains the scripts that configure a live system during the "
 "boot process (early userspace)."
 msgstr ""
-"B<live-boot> contiene los scripts que configuran un sistema Debian Live "
-"durante el proceso de arranque (early userspace)."
+"B<live-boot> contiene los scripts que configuran un sistema en vivo durante "
+"el proceso de arranque (early userspace)."
 
 #.  FIXME
 #. type: Plain text
 #: en/live-boot.7:11
-#, fuzzy
-#| msgid ""
-#| "live-boot is a hook for the initramfs-tools, used to generate a initramfs "
-#| "capable to boot live systems, such as those created by I<live-helper>(7). "
-#| "This includes the Debian Live isos, netboot tarballs, and usb stick "
-#| "images."
 msgid ""
 "live-boot is a hook for the initramfs-tools, used to generate a initramfs "
 "capable to boot live systems, such as those created by I<live-helper>(7). "
@@ -85,18 +75,12 @@ msgid ""
 msgstr ""
 "live-boot es un hook para initramfs-tools, usado para generar un initramfs "
 "capaz de arrancar sistemas en vivo, tales como los creados por I<live-helper>"
-"(7). Esto incluye las isos de Debian Live, netboot tarballs e imágenes para "
-"llaves usb. "
+"(7). Esto incluye las ISOs de Live Systems, netboot tarballs y las imágenes "
+"para llaves usb. "
 
 #.  FIXME
 #. type: Plain text
 #: en/live-boot.7:14
-#, fuzzy
-#| msgid ""
-#| "At boot time it will look for a (read-only) media containing a \"/live\" "
-#| "directory where a root filesystems (often a compressed filesystem image "
-#| "like squashfs) is stored. If found, it will create a writable "
-#| "environment, using aufs, for Debian like systems to boot from."
 msgid ""
 "At boot time it will look for a (read-only) media containing a \"/live\" "
 "directory where a root filesystems (often a compressed filesystem image like "
@@ -107,8 +91,7 @@ msgstr ""
 "contenga un directorio \"/live\" dónde se almacena un sistema de ficheros "
 "raíz (a menudo se trata de una imagen comprimida de un sistema de ficheros "
 "como squashfs). Si live-boot lo encuentra, creará un entorno de escritura, "
-"usando aufs, a partir del cual pueda arrancar un sistema Debian u otro "
-"similar."
+"usando aufs, a partir del cual pueda arrancar un sistema."
 
 #. type: SH
 #: en/live-boot.7:15
@@ -323,23 +306,16 @@ msgstr "B<iscsi>=I<server-ip[,server-port];target-name>"
 
 #. type: Plain text
 #: en/live-boot.7:62
-#, fuzzy
-#| 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:"
 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 your "
 "ietd.conf might look like this:"
 msgstr ""
-"Arranca desde un objetivo iSCSI que tiene una iso o una imagen disco en vivo "
-"como uno de sus LUNs. Se busca en el objetivo especificado un LUN que sea "
-"similar a un medio en vivo. Si se utiliza el software B<iscsitarget> del "
-"objetivo iSCSI que se encuentra disponible en un paquete Debian la ietd.conf "
-"podría ser similar al siguiente: "
+"Arranca desde un iSCSI que tiene una iso o una imagen de disco en vivo como "
+"uno de sus LUNs. Se busca en el objetivo especificado un LUN que sea similar "
+"a un medio en vivo. Si se utiliza el software de iSCSI B<iscsitarget> el "
+"ietd.conf podría ser similar al siguiente: "
 
 #. type: Plain text
 #: en/live-boot.7:64
@@ -522,12 +498,6 @@ msgstr "B<live-media-offset>=I<BYTES>"
 
 #. type: Plain text
 #: en/live-boot.7:89
-#, fuzzy
-#| 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 the Debian Live iso or image inside another iso or image, to create "
-#| "\"clean\" images."
 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 "
@@ -536,8 +506,8 @@ msgid ""
 msgstr ""
 "De esta manera se puede especificar a live-boot que la imagen comienza en "
 "BYTES en el dispositivo anteriormente especificado, o auto-descubierto, esto "
-"podría ser útil para esconder la iso o la imagen Debian Live dentro de otra "
-"iso o imagen, para crear imágenes \"limpias\"."
+"podría ser útil para esconder la iso o la imagen dentro de otra iso o "
+"imagen, para crear imágenes \"limpias\"."
 
 #. type: IP
 #: en/live-boot.7:89
@@ -1071,15 +1041,14 @@ msgstr "PÁGINA WEB"
 
 #. type: Plain text
 #: en/live-boot.7:165 en/persistence.conf.5:202
-#, fuzzy
 msgid ""
 "More information about live-boot and the Live Systems project can be found "
 "on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
 "at E<lt>I<http://live-systems.org/manual/>E<gt>."
 msgstr ""
-"Se puede encontrar más información acerca de live-boot y el proyecto Debian "
-"Live en la página web E<lt>I<http://live-systems.org/>E<gt> y en el manual "
-"en E<lt>I<http://live-systems.org/manual/>E<gt>."
+"Se puede encontrar más información acerca de live-boot y el proyecto Live "
+"Systems en la página web E<lt>I<http://live-systems.org/>E<gt> y en el "
+"manual en E<lt>I<http://live-systems.org/manual/>E<gt>."
 
 #. type: SH
 #: en/live-boot.7:166 en/persistence.conf.5:203
@@ -1089,7 +1058,6 @@ msgstr "ERRORES"
 
 #. type: Plain text
 #: en/live-boot.7:168 en/persistence.conf.5:205
-#, fuzzy
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-boot package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -1097,9 +1065,9 @@ msgid ""
 "debian.org>E<gt>."
 msgstr ""
 "Se puede notificar los fallos enviando un informe de errores sobre el "
-"paquete live-boot en el Debian Bug Tracking System en E<lt>I<http://bugs."
-"debian.org/>E<gt> o escribiendo un mensaje a la lista de correo de Debian "
-"Live a la dirección E<lt>I<debian-live@lists.debian.org>E<gt>."
+"paquete live-boot al Sistema de Seguimiento de Errores en E<lt>I<http://bugs."
+"debian.org/>E<gt> o escribiendo un mensaje a la lista de correo de Live "
+"Systems a la dirección E<lt>I<debian-live@lists.debian.org>E<gt>."
 
 #. type: SH
 #: en/live-boot.7:169 en/persistence.conf.5:206
@@ -1109,9 +1077,7 @@ msgstr "AUTOR"
 
 #. type: Plain text
 #: en/live-boot.7:170 en/persistence.conf.5:207
-#, fuzzy
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
-"live-boot fue escrito por Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
-"para el proyecto Debian."
+"live-boot fue escrito por Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."

diff --git a/manpages/po/es/persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po
index 2f90008..b349e5d 100644 (file)
--- a/manpages/po/es/persistence.conf.5.po
+++ b/manpages/po/es/persistence.conf.5.po
@@ -4,11 +4,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0~a10-1\n"
-"POT-Creation-Date: 2013-04-01 08:19+0300\n"
-"PO-Revision-Date: 2012-06-07 19:11+0200\n"
-"Last-Translator: Carlos Zuferri «chals» <chals@altorricon.com>\n"
-"Language-Team:  none\n"
+"Project-Id-Version: live-boot 4.0~a11-1\n"
+"POT-Creation-Date: 2013-05-06 14:23+0300\n"
+"PO-Revision-Date: 2013-04-13 16:38+0100\n"
+"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
+"Language-Team: none\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,20 +23,20 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-04-01"
-msgstr "01.04.2013"
+msgid "2013-05-06"
+msgstr "06.05.2013"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a10-1"
-msgstr "4.0~a10-1"
+msgid "4.0~a11-1"
+msgstr "4.0~a11-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "Live Systems Project"
-msgstr "Proyecto Debian Live"
+msgstr "Proyecto Live Systems"
 
 #. type: SH
 #: en/live-boot.7:3 en/persistence.conf.5:3
@@ -85,15 +85,14 @@ msgstr "PÁGINA WEB"
 
 #. type: Plain text
 #: en/live-boot.7:165 en/persistence.conf.5:202
-#, fuzzy
 msgid ""
 "More information about live-boot and the Live Systems project can be found "
 "on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
 "at E<lt>I<http://live-systems.org/manual/>E<gt>."
 msgstr ""
-"Se puede encontrar más información acerca de live-boot y el proyecto Debian "
-"Live en la página web E<lt>I<http://live-systems.org/>E<gt> y en el manual "
-"en E<lt>I<http://live-systems.org/manual/>E<gt>."
+"Se puede encontrar más información acerca de live-boot y el proyecto Live "
+"Systems en la página web E<lt>I<http://live-systems.org/>E<gt> y en el "
+"manual en E<lt>I<http://live-systems.org/manual/>E<gt>."
 
 #. type: SH
 #: en/live-boot.7:166 en/persistence.conf.5:203
@@ -103,7 +102,6 @@ msgstr "ERRORES"
 
 #. type: Plain text
 #: en/live-boot.7:168 en/persistence.conf.5:205
-#, fuzzy
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-boot package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -111,9 +109,9 @@ msgid ""
 "debian.org>E<gt>."
 msgstr ""
 "Se puede notificar los fallos enviando un informe de errores sobre el "
-"paquete live-boot en el Debian Bug Tracking System en E<lt>I<http://bugs."
-"debian.org/>E<gt> o escribiendo un mensaje a la lista de correo de Debian "
-"Live a la dirección E<lt>I<debian-live@lists.debian.org>E<gt>."
+"paquete live-boot al Sistema de Seguimiento de Errores en E<lt>I<http://bugs."
+"debian.org/>E<gt> o escribiendo un mensaje a la lista de correo de Live "
+"Systems a la dirección E<lt>I<debian-live@lists.debian.org>E<gt>."
 
 #. type: SH
 #: en/live-boot.7:169 en/persistence.conf.5:206
@@ -123,12 +121,10 @@ msgstr "AUTOR"
 
 #. type: Plain text
 #: en/live-boot.7:170 en/persistence.conf.5:207
-#, fuzzy
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
-"live-boot fue escrito por Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
-"para el proyecto Debian."
+"live-boot fue escrito por Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 
 #. type: Plain text
 #: en/persistence.conf.5:6

diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index ff22863..120aeea 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"
-"POT-Creation-Date: 2013-04-01 08:19+0300\n"
+"POT-Creation-Date: 2013-05-06 14:23+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"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-04-01"
+msgid "2013-05-06"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a10-1"
+msgid "4.0~a11-1"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot
index b1ad1c4..517d088 100644 (file)
--- a/manpages/pot/persistence.conf.5.pot
+++ b/manpages/pot/persistence.conf.5.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2013-04-01 08:19+0300\n"
+"POT-Creation-Date: 2013-05-06 14:23+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"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-04-01"
+msgid "2013-05-06"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a10-1"
+msgid "4.0~a11-1"
 msgstr ""
 
 #. type: TH

diff --git a/scripts/boot/0110-debug b/scripts/boot/0010-debug
similarity index 100%
rename from scripts/boot/0110-debug
rename to scripts/boot/0010-debug

diff --git a/scripts/boot/0120-read-only b/scripts/boot/0020-read-only
similarity index 100%
rename from scripts/boot/0120-read-only
rename to scripts/boot/0020-read-only

diff --git a/scripts/boot/3010-verify-checksums b/scripts/boot/0030-verify-checksums
similarity index 100%
rename from scripts/boot/3010-verify-checksums
rename to scripts/boot/0030-verify-checksums

diff --git a/scripts/boot/9990-cmdline-old b/scripts/boot/9990-cmdline-old
index b8fc4a6..18bb6c3 100755 (executable)
--- a/scripts/boot/9990-cmdline-old
+++ b/scripts/boot/9990-cmdline-old
@@ -15,7 +15,7 @@ Cmdline_old ()
                                ;;
 
                        BOOTIF=*)
-                               BOOTIF="${x#BOOTIF=}"
+                               BOOTIF="${_PARAMETER#BOOTIF=}"
                                ;;
 
                        dhcp)

diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh
index fd10e5d..682959d 100755 (executable)
--- a/scripts/boot/9990-main.sh
+++ b/scripts/boot/9990-main.sh
@@ -2,7 +2,7 @@
 
 # set -e
 
-Main ()
+Live ()
 {
        if [ -x /scripts/local-top/cryptroot ]
        then

diff --git a/scripts/boot/9990-misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh
index 83b822d..5c5341c 100755 (executable)
--- a/scripts/boot/9990-misc-helpers.sh
+++ b/scripts/boot/9990-misc-helpers.sh
@@ -938,7 +938,7 @@ find_persistence_media ()
        white_listed_devices="${2}"
        ret=""
 
-       black_listed_devices="$(what_is_mounted_on /live/medium)"
+       black_listed_devices="$(what_is_mounted_on /live/medium) $(what_is_mounted_on /live/findiso) $(what_is_mounted_on /live/fromiso)"
 
        for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}")
        do
@@ -989,6 +989,21 @@ find_persistence_media ()
                        result=$(probe_for_file_name "${overlays}" ${dev})
                        if [ -n "${result}" ]
                        then
+                               local loopdevice
+                               loopdevice=${result##*=}
+                               if is_in_comma_sep_list luks ${PERSISTENCE_ENCRYPTION} && is_luks_partition ${loopdevice}
+                               then
+                                       local luksfile
+                                       luksfile=""
+                                       if luksfile=$(open_luks_device "${loopdevice}")
+                                       then
+                                               result=${result%%=*}
+                                               result="${result}=${luksfile}"
+                                       else
+                                               losetup -d $loopdevice
+                                               result=""
+                                       fi
+                               fi
                                ret="${ret} ${result}"
                                continue
                        fi

diff --git a/scripts/boot/9990-mount-cifs.sh b/scripts/boot/9990-mount-cifs.sh
index a8ef3f4..8dd1818 100755 (executable)
--- a/scripts/boot/9990-mount-cifs.sh
+++ b/scripts/boot/9990-mount-cifs.sh
@@ -10,7 +10,7 @@ do_cifsmount ()
        then
                if [ -z "${NFSOPTS}" ]
                then
-                       CIFSOPTS="-ouser=root,password="
+                       CIFSOPTS="-o user=root,password="
                else
                        CIFSOPTS="-o ${NFSOPTS}"
                fi
@@ -18,7 +18,7 @@ do_cifsmount ()
                log_begin_msg "Trying mount.cifs ${NFSROOT} ${mountpoint} ${CIFSOPTS}"
                modprobe -q cifs
 
-               if mount.cifs "${NFSROOT}" "${mountpoint}" "${CIFSOPTS}"
+               if mount.cifs "${NFSROOT}" "${mountpoint}" ${CIFSOPTS}
                then
                        rc=0
                fi

diff --git a/scripts/boot/9990-networking.sh b/scripts/boot/9990-networking.sh
index d9607b7..cdec92a 100755 (executable)
--- a/scripts/boot/9990-networking.sh
+++ b/scripts/boot/9990-networking.sh
@@ -2,6 +2,57 @@
 
 #set -e
 
+Device_from_bootif ()
+{
+       # support for Syslinux IPAPPEND parameter
+       # it sets the BOOTIF variable on the kernel parameter
+
+       if [ -n "${BOOTIF}" ]
+       then
+       # pxelinux sets BOOTIF to a value based on the mac address of the
+       # network card used to PXE boot, so use this value for DEVICE rather
+       # than a hard-coded device name from initramfs.conf. this facilitates
+       # network booting when machines may have multiple network cards.
+       # pxelinux sets BOOTIF to 01-$mac_address
+
+       # strip off the leading "01-", which isn't part of the mac
+       # address
+       temp_mac=${BOOTIF#*-}
+
+       # convert to typical mac address format by replacing "-" with ":"
+       bootif_mac=""
+       IFS='-'
+       for x in $temp_mac
+       do
+               if [ -z "$bootif_mac" ]
+               then
+                       bootif_mac="$x"
+               else
+                       bootif_mac="$bootif_mac:$x"
+               fi
+       done
+       unset IFS
+
+       # look for devices with matching mac address, and set DEVICE to
+       # appropriate value if match is found.
+
+       for device in /sys/class/net/*
+       do
+               if [ -f "$device/address" ]
+               then
+               current_mac=$(cat "$device/address")
+
+                       if [ "$bootif_mac" = "$current_mac" ]
+                       then
+                               DEVICE=${device##*/}
+                               break
+                       fi
+               fi
+       done
+       fi
+
+}
+
 do_netsetup ()
 {
        modprobe -q af_packet # For DHCP
@@ -14,52 +65,8 @@ do_netsetup ()
 
        if [ -z "${NETBOOT}" ] && [ -z "${FETCH}" ] && [ -z "${HTTPFS}" ] && [ -z "${FTPFS}" ]
        then
-               # support for Syslinux IPAPPEND parameter
-               # it sets the BOOTIF variable on the kernel parameter
-
-               if [ -n "${BOOTIF}" ]
-               then
-                       # pxelinux sets BOOTIF to a value based on the mac address of the
-                       # network card used to PXE boot, so use this value for DEVICE rather
-                       # than a hard-coded device name from initramfs.conf. this facilitates
-                       # network booting when machines may have multiple network cards.
-                       # pxelinux sets BOOTIF to 01-$mac_address
-
-                       # strip off the leading "01-", which isn't part of the mac
-                       # address
-                       temp_mac=${BOOTIF#*-}
-
-                       # convert to typical mac address format by replacing "-" with ":"
-                       bootif_mac=""
-                       IFS='-'
-                       for x in $temp_mac
-                       do
-                               if [ -z "$bootif_mac" ]
-                               then
-                                       bootif_mac="$x"
-                               else
-                                       bootif_mac="$bootif_mac:$x"
-                               fi
-                       done
-                       unset IFS
-
-                       # look for devices with matching mac address, and set DEVICE to
-                       # appropriate value if match is found.
-
-                       for device in /sys/class/net/*
-                       do
-                               if [ -f "$device/address" ]
-                               then
-                                       current_mac=$(cat "$device/address")
-
-                                       if [ "$bootif_mac" = "$current_mac" ]
-                                       then
-                                               DEVICE=${device##*/}
-                                               break
-                                       fi
-                               fi
-                       done
-               fi
+               # See if we can select the device from BOOTIF
+               Device_from_bootif
 
                # if ethdevice was not specified on the kernel command line
                # make sure we try to get a working network configuration

diff --git a/scripts/boot/9990-select-eth-device.sh b/scripts/boot/9990-select-eth-device.sh
index 5a769ce..14fa4ef 100755 (executable)
--- a/scripts/boot/9990-select-eth-device.sh
+++ b/scripts/boot/9990-select-eth-device.sh
@@ -26,31 +26,40 @@ Select_eth_device ()
 
        # Available Ethernet interfaces ?
        l_interfaces=""
-       echo "Waiting for ethernet card(s) up... If this fails, maybe the ethernet card is not supported by the kernel `uname -r`?"
-       while [ -z "$l_interfaces" ]
-       do
-               l_interfaces="$(cd /sys/class/net/ && ls -d eth* 2>/dev/null)"
-       done
 
-       if [ $(echo $l_interfaces | wc -w) -lt 2 ]
+       # See if we can derive the boot device
+       Device_from_bootif
+
+       if [ -z "$DEVICE" ]
        then
-               # only one interface : no choice
-               echo "DEVICE=$l_interfaces" >> /conf/param.conf
-               return
-       fi
+               echo "Waiting for ethernet card(s) up... If this fails, maybe the ethernet card is not supported by the kernel `uname -r`?"
+               while [ -z "$l_interfaces" ]
+               do
+                       l_interfaces="$(cd /sys/class/net/ && ls -d eth* 2>/dev/null)"
+               done
 
-       # If user force to use specific device, write it
-       for ARGUMENT in ${_CMDLINE}
-       do
-               case "${ARGUMENT}" in
-                       live-netdev=*)
+               if [ $(echo $l_interfaces | wc -w) -lt 2 ]
+               then
+                       # only one interface : no choice
+                       echo "DEVICE=$l_interfaces" >> /conf/param.conf
+                       return
+               fi
+
+               # If user force to use specific device, write it
+               for ARGUMENT in ${_CMDLINE}
+               do
+                       case "${ARGUMENT}" in
+                               live-netdev=*)
                                NETDEV="${ARGUMENT#live-netdev=}"
                                echo "DEVICE=$NETDEV" >> /conf/param.conf
                                echo "Found live-netdev parameter, forcing to to use network device $NETDEV."
                                return
                                ;;
-               esac
-       done
+                       esac
+               done
+       else
+               l_interfaces="$DEVICE"
+       fi
 
        found_eth_dev=""
        while true