Adding upstream version 4.0~a5.

diff --git a/VERSION b/VERSION
index ccb6a78..0fdde2b 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0~a4-1
+4.0~a5-1

diff --git a/manpages/bin/update-version.sh b/manpages/bin/update-version.sh
index 6326ada..1f7b7d3 100755 (executable)
--- a/manpages/bin/update-version.sh
+++ b/manpages/bin/update-version.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-boot(7) - System Boot Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -35,7 +35,9 @@ do
        then
                for _FILE in po/${_LANGUAGE}/*.po
                do
-                       sed -i -e "s|^msgstr .*.2012\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" "${_FILE}"
+                       sed -i  -e "s|^msgstr .*.2013-.*$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \
+                               -e "s|^msgstr .*.2013\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \
+                       "${_FILE}"
                done
        fi
 done
@@ -45,6 +47,8 @@ if ls po/pt_BR/*.po > /dev/null 2>&1
 then
        for _FILE in po/pt_BR/*.po
        do
-               sed -i -e "s|^msgstr .*-2012\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" "${_FILE}"
+               sed -i  -e "s|^msgstr .*.2013-.*$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \
+                       -e "s|^msgstr .*-2013\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \
+               "${_FILE}"
        done
 fi

diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 7d0d9e2..f3b7b50 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 2013\-01\-02 4.0~a4\-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 12.02.2013 4.0~a5\-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Scripts
@@ -164,11 +164,8 @@ skipped.
 .IP \fBnopersistence\fP 4
 disables the "persistence" feature, useful if the bootloader (like syslinux)
 has been installed with persistence 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 \fBnoeject\fP 4
+Do not prompt to eject the live medium.
 .IP \fBramdisk\-size\fP 4
 This parameters allows to set a custom ramdisk size (it's the '\-o size'
 option of tmpfs mount). By default, there is no ramdisk size set, so the
@@ -210,12 +207,10 @@ probing for persistence media. If "filesystem" is in the list, filesystems
 with matching labels will be used; if "file" is in the list, all filesystems
 will be probed for archives and image files with matching filenames. The
 default is "file,filesystem".
-.IP \fBpersistence\-subtext\fP=\fISUFFIX\fP 4
-Add a suffix when searching for the image filenames or partition labels to
-use for the above mentioned persistence feature, the SUFFIX will be added
-after a dash (e.g.: "live\-sn" would transform to "live\-sn\-SUFFIX"). This is
-handy to test multiple live\-boot based live\-systems with different
-persistence storage choices.
+.IP \fBpersistence\-label\fP=\fILABEL\fP 4
+live\-boot will use the name "LABEL" instead of "persistence" when searching
+for persistent storage. LABEL can be any valid filename, partition label, or
+GPT name.
 .IP \fBquickreboot\fP 4
 This option causes live\-boot to reboot without attempting to eject the media
 and without asking the user to remove the boot media.

diff --git a/manpages/de/persistence.conf.de.5 b/manpages/de/persistence.conf.de.5
index ec7f232..ae47be5 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 2013\-01\-02 4.0~a4\-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 12.02.2013 4.0~a5\-1 "Debian Live 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 cb21e6e..89b05ed 100644 (file)
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2013\-01\-02 4.0~a4-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2013\-02\-12 4.0~a5-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts
@@ -100,10 +100,8 @@ This lets you specify custom nfs options.
 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 be checked at boot time, use this parameter, otherwise they are skipped.
 .IP "\fBnopersistence\fR" 4
 disables the "persistence" feature, useful if the bootloader (like syslinux) has been installed with persistence 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 "\fBnoeject\fR" 4
+Do not prompt to eject the live medium.
 .IP "\fBramdisk\-size\fR" 4
 This parameters allows to set a custom ramdisk size (it's the '\-o size' option of tmpfs mount). By default, there is no ramdisk size set, so the default of mount applies (currently 50% of available RAM). Note that this option has no currently no effect when booting with toram.
 .IP "\fBswapon\fR" 4
@@ -122,8 +120,8 @@ live\-boot will look for persistency files in the root directory of a partition,
 Filesystem changes are not saved back to persistence media. In particular, overlays and netboot NFS mounts are mounted read-only.
 .IP "\fBpersistence\-storage\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4
 This option determines which types of persistence storage to consider when probing for persistence media. If "filesystem" is in the list, filesystems with matching labels will be used; if "file" is in the list, all filesystems will be probed for archives and image files with matching filenames. The default is "file,filesystem".
-.IP "\fBpersistence\-subtext\fR=\fISUFFIX\fR" 4
-Add a suffix when searching for the image filenames or partition labels to use for the above mentioned persistence feature, the SUFFIX will be added after a dash (e.g.: "live-sn" would transform to "live-sn-SUFFIX"). This is handy to test multiple live-boot based live-systems with different persistence storage choices.
+.IP "\fBpersistence\-label\fR=\fILABEL\fR" 4
+live-boot will use the name "LABEL" instead of "persistence" when searching for persistent storage. LABEL can be any valid filename, partition label, or GPT name.
 .IP "\fBquickreboot\fR" 4
 This option causes live\-boot to reboot without attempting to eject the media and without asking the user to remove the boot media.
 .IP "\fBshowmounts\fR" 4

diff --git a/manpages/en/persistence.conf.5 b/manpages/en/persistence.conf.5
index 46b4414..ca4c443 100644 (file)
--- a/manpages/en/persistence.conf.5
+++ b/manpages/en/persistence.conf.5
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2013\-01\-02 4.0~a4-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2013\-02\-12 4.0~a5-1 "Debian Live 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 89909eb..a9fa033 100644 (file)
--- a/manpages/es/live-boot.es.7
+++ b/manpages/es/live-boot.es.7
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 2013\-01\-02 4.0~a4\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT 7 12.02.2013 4.0~a5\-1 "Proyecto Debian Live"
 
 .SH NOMBRE
 \fBlive\-boot\fP \- Scripts de Arranque del Sistema
@@ -173,11 +173,8 @@ utilizar este parámetro, de lo contrario, se omite.
 .IP \fBnopersistence\fP 4
 desactiva la "persistencia", es útil si el gestor de arranque (como
 syslinux) se ha instalado con persistencia habilitada.
-.IP \fBnoprompt\fP 4
-No preguntar para expulsar el CD o extraer la unidad flash USB al reiniciar.
-.IP \fBnoprompt\fP=\fITYPE\fP 4
-Indica a live\-boot que no pregunte para expulsar el CD (usando noprompt=cd)
-o extraer la unidad flash USB (usando noprompt=usb) al reiniciar.
+.IP \fBnoeject\fP 4
+No pedir que se extraiga el dispositivo en vivo.
 .IP \fBramdisk\-size\fP 4
 Este parámetro permite establecer un tamaño de disco RAM personalizado (que
 es la opción '\-o size' del montaje tmpfs). No hay un tamaño de ramdisk
@@ -225,13 +222,10 @@ está en la lista, se usarán los sistemas de ficheros que tengan su etiqueta
 correspondiente; si "file" está en la lista, todos los sistemas de ficheros
 se probarán buscando ficheros y ficheros imagen con sus etiquetas
 correspondientes. Por defecto es "file,filesystem".
-.IP \fBpersistence\-subtext\fP=\fISUFFIX\fP 4
-Añadir un sufijo cuando se buscan los nombres de las imágenes o etiquetas de
-las particiones a utilizar para la función de la persistencia mencionada
-anteriormente, el SUFFIX se añadirá después de un guión (por ejemplo:
-"live\-sn" se transformaría en "live\-sn\-SUFFIX"). Esto es útil para probar
-múltiples sistemas en vivo basados en live\-boot con diferentes opciones de
-almacenamiento con persistencia.
+.IP \fBpersistence\-label\fP=\fILABEL\fP 4
+live\-boot will use the name "LABEL" instead of "persistence" when searching
+for persistent storage. LABEL can be any valid filename, partition label, or
+GPT name.
 .IP \fBquickreboot\fP 4
 Esta opción hace que live\-boot reinicie sin tratar de expulsar los medios y
 sin pedirle al usuario que extraiga el dispositivo usado para arrancar.

diff --git a/manpages/es/persistence.conf.es.5 b/manpages/es/persistence.conf.es.5
index b499f3c..2719b51 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 2013\-01\-02 4.0~a4\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT conf 12.02.2013 4.0~a5\-1 "Proyecto Debian Live"
 
 .SH NOMBRE
 \fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con

diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index 7e7fcfc..ede310b 100644 (file)
--- a/manpages/po/de/live-boot.7.po
+++ b/manpages/po/de/live-boot.7.po
@@ -1,11 +1,11 @@
 # German translations for live-boot package
-# Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+# Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 # This file is distributed under the same license as the live-boot package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0~a4-1\n"
-"POT-Creation-Date: 2013-01-02 11:36+0100\n"
+"Project-Id-Version: live-boot 4.0~a5-1\n"
+"POT-Creation-Date: 2013-02-12 08:28+0100\n"
 "PO-Revision-Date: 2012-04-08 22:48+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-01-02"
-msgstr ""
+msgid "2013-02-12"
+msgstr "12.02.2013"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a4-1"
-msgstr "4.0~a4-1"
+msgid "4.0~a5-1"
+msgstr "4.0~a5-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
@@ -514,35 +514,22 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:103
 #, no-wrap
-msgid "B<noprompt>"
+msgid "B<noeject>"
 msgstr ""
 
 #. type: Plain text
 #: en/live-boot.7:105
-msgid "Do not prompt to eject the CD or remove the USB flash drive on reboot."
+msgid "Do not prompt to eject the live medium."
 msgstr ""
 
 #. type: IP
 #: en/live-boot.7:105
 #, no-wrap
-msgid "B<noprompt>=I<TYPE>"
-msgstr ""
-
-#. type: Plain text
-#: en/live-boot.7:107
-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:107
-#, no-wrap
 msgid "B<ramdisk-size>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:109
+#: en/live-boot.7:107
 msgid ""
 "This parameters allows to set a custom ramdisk size (it's the '-o size' "
 "option of tmpfs mount). By default, there is no ramdisk size set, so the "
@@ -551,24 +538,24 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:109
+#: en/live-boot.7:107
 #, no-wrap
 msgid "B<swapon>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:111
+#: en/live-boot.7:109
 msgid "This parameter enables usage of local swap partitions."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:111
+#: en/live-boot.7:109
 #, no-wrap
 msgid "B<persistence>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:113
+#: en/live-boot.7:111
 msgid ""
 "live-boot will probe devices for persistence media. These can be partitions "
 "(with the correct GPT name), filesystems (with the correct label) or image "
@@ -578,13 +565,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:113
+#: en/live-boot.7:111
 #, no-wrap
 msgid "B<persistence-encryption>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:115
+#: en/live-boot.7:113
 msgid ""
 "This option determines which types of encryption that we allow to be used "
 "when probing devices for persistence media. If \"none\" is in the list, we "
@@ -594,13 +581,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:115
+#: en/live-boot.7:113
 #, no-wrap
 msgid "B<persistence-media>={I<removable>|I<removable-usb>}"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:117
+#: en/live-boot.7:115
 msgid ""
 "If you specify the keyword 'removable', live-boot will try to find "
 "persistence partitions on removable media only. Note that if you want to "
@@ -609,13 +596,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:117
+#: en/live-boot.7:115
 #, no-wrap
 msgid "B<persistence-method>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:119
+#: en/live-boot.7:117
 msgid ""
 "This option determines which types of persistence media we allow. If "
 "\"overlay\" is in the list, we consider overlays (i.e. \"live-rw\" and "
@@ -623,13 +610,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:119
+#: en/live-boot.7:117
 #, no-wrap
 msgid "B<persistence-path>=I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:121
+#: en/live-boot.7:119
 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 "
@@ -637,26 +624,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:121
+#: en/live-boot.7:119
 #, no-wrap
 msgid "B<persistence-read-only>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:123
+#: en/live-boot.7:121
 msgid ""
 "Filesystem changes are not saved back to persistence media. In particular, "
 "overlays and netboot NFS mounts are mounted read-only."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:123
+#: en/live-boot.7:121
 #, no-wrap
 msgid "B<persistence-storage>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:125
+#: en/live-boot.7:123
 msgid ""
 "This option determines which types of persistence storage to consider when "
 "probing for persistence media. If \"filesystem\" is in the list, filesystems "
@@ -666,42 +653,40 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:125
+#: en/live-boot.7:123
 #, no-wrap
-msgid "B<persistence-subtext>=I<SUFFIX>"
+msgid "B<persistence-label>=I<LABEL>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:127
+#: en/live-boot.7:125
 msgid ""
-"Add a suffix when searching for the image filenames or partition labels to "
-"use for the above mentioned persistence feature, the SUFFIX will be added "
-"after a dash (e.g.: \"live-sn\" would transform to \"live-sn-SUFFIX\"). This "
-"is handy to test multiple live-boot based live-systems with different "
-"persistence storage choices."
+"live-boot will use the name \"LABEL\" instead of \"persistence\" when "
+"searching for persistent storage. LABEL can be any valid filename, partition "
+"label, or GPT name."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:127
+#: en/live-boot.7:125
 #, no-wrap
 msgid "B<quickreboot>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:129
+#: en/live-boot.7:127
 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:129
+#: en/live-boot.7:127
 #, no-wrap
 msgid "B<showmounts>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:131
+#: en/live-boot.7:129
 msgid ""
 "This parameter will make live-boot to show on \"/\" the ro filesystems "
 "(mostly compressed) on \"/lib/live\". This is not enabled by default because "
@@ -710,26 +695,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:131
+#: en/live-boot.7:129
 #, no-wrap
 msgid "B<silent>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:133
+#: en/live-boot.7:131
 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:133
+#: en/live-boot.7:131
 #, no-wrap
 msgid "B<todisk>=I<DEVICE>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:135
+#: en/live-boot.7:133
 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 "
@@ -739,13 +724,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:135
+#: en/live-boot.7:133
 #, no-wrap
 msgid "B<toram>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:137
+#: en/live-boot.7:135
 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 "
@@ -753,14 +738,14 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:137
+#: en/live-boot.7:135
 #, no-wrap
 msgid "B<union>=aufs|unionfs"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-boot.7:140
+#: en/live-boot.7:138
 msgid ""
 "By default, live-boot uses aufs. With this parameter, you can switch to "
 "unionfs."
@@ -768,33 +753,33 @@ msgstr ""
 
 #.  FIXME
 #. type: SH
-#: en/live-boot.7:142
+#: en/live-boot.7:140
 #, no-wrap
 msgid "FILES (old)"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:143
+#: en/live-boot.7:141
 #, no-wrap
 msgid "B</etc/live.conf>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:145
+#: en/live-boot.7:143
 msgid ""
 "Some variables can be configured via this config file (inside the live "
 "system)."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:145
+#: en/live-boot.7:143
 #, no-wrap
 msgid "B<live/filesystem.module>"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-boot.7:148
+#: en/live-boot.7:146
 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 \"/"
@@ -807,75 +792,75 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:149
+#: en/live-boot.7:147
 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:150
+#: en/live-boot.7:148
 #, no-wrap
 msgid "B</etc/live/boot.conf>"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:151
+#: en/live-boot.7:149
 #, no-wrap
 msgid "B</etc/live/boot/*>"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:152
+#: en/live-boot.7:150
 #, no-wrap
 msgid "B<live/boot.conf>"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:153
+#: en/live-boot.7:151
 #, no-wrap
 msgid "B<live/boot/*>"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:154
+#: en/live-boot.7:152
 #, no-wrap
 msgid "B<persistence.conf>"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:156 en/persistence.conf.5:191
+#: en/live-boot.7:154 en/persistence.conf.5:191
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:158
+#: en/live-boot.7:156
 msgid "I<persistence.conf>(5)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:160 en/persistence.conf.5:195
+#: en/live-boot.7:158 en/persistence.conf.5:195
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:162 en/persistence.conf.5:197
+#: en/live-boot.7:160 en/persistence.conf.5:197
 msgid "I<live-config>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:164 en/persistence.conf.5:199
+#: en/live-boot.7:162 en/persistence.conf.5:199
 msgid "I<live-tools>(7)"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:165 en/persistence.conf.5:200
+#: en/live-boot.7:163 en/persistence.conf.5:200
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:167 en/persistence.conf.5:204
+#: en/live-boot.7:165 en/persistence.conf.5:204
 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 "
@@ -883,13 +868,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:168 en/persistence.conf.5:205
+#: en/live-boot.7:166 en/persistence.conf.5:205
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:170 en/persistence.conf.5:210
+#: en/live-boot.7:168 en/persistence.conf.5:210
 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 "
@@ -898,13 +883,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:171 en/persistence.conf.5:211
+#: en/live-boot.7:169 en/persistence.conf.5:211
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:172
+#: en/live-boot.7:170
 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/persistence.conf.5.po b/manpages/po/de/persistence.conf.5.po
index 83ea2aa..c39fd36 100644 (file)
--- a/manpages/po/de/persistence.conf.5.po
+++ b/manpages/po/de/persistence.conf.5.po
@@ -1,11 +1,11 @@
 # German translations for live-boot package
-# Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+# Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 # This file is distributed under the same license as the live-boot package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0~a4-1\n"
-"POT-Creation-Date: 2013-01-02 11:36+0100\n"
+"Project-Id-Version: live-boot 4.0~a5-1\n"
+"POT-Creation-Date: 2013-02-12 08:28+0100\n"
 "PO-Revision-Date: 2012-04-08 22:48+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-01-02"
-msgstr ""
+msgid "2013-02-12"
+msgstr "12.02.2013"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a4-1"
-msgstr "4.0~a4-1"
+msgid "4.0~a5-1"
+msgstr "4.0~a5-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
@@ -58,34 +58,34 @@ msgid "OPTIONS"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:156 en/persistence.conf.5:191
+#: en/live-boot.7:154 en/persistence.conf.5:191
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:160 en/persistence.conf.5:195
+#: en/live-boot.7:158 en/persistence.conf.5:195
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:162 en/persistence.conf.5:197
+#: en/live-boot.7:160 en/persistence.conf.5:197
 msgid "I<live-config>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:164 en/persistence.conf.5:199
+#: en/live-boot.7:162 en/persistence.conf.5:199
 msgid "I<live-tools>(7)"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:165 en/persistence.conf.5:200
+#: en/live-boot.7:163 en/persistence.conf.5:200
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:167 en/persistence.conf.5:204
+#: en/live-boot.7:165 en/persistence.conf.5:204
 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 "
@@ -93,13 +93,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:168 en/persistence.conf.5:205
+#: en/live-boot.7:166 en/persistence.conf.5:205
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:170 en/persistence.conf.5:210
+#: en/live-boot.7:168 en/persistence.conf.5:210
 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 "
@@ -108,7 +108,7 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:171 en/persistence.conf.5:211
+#: en/live-boot.7:169 en/persistence.conf.5:211
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""

diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po
index f48b62b..0c8189a 100644 (file)
--- a/manpages/po/es/live-boot.7.po
+++ b/manpages/po/es/live-boot.7.po
@@ -1,14 +1,14 @@
 # Spanish translations for live-boot package
-# Copyright (C) 2012 Carlos Zuferri «chals» <chals@altorricon.com>
+# Copyright (C) 2012-2013 Carlos Zuferri «chals» <chals@altorricon.com>
 # This file is distributed under the same license as the live-boot package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0~a4-1\n"
-"POT-Creation-Date: 2013-01-02 11:36+0100\n"
-"PO-Revision-Date: 2012-06-07 20:29+0200\n"
-"Last-Translator: Carlos Zuferri «chals» <chals@altorricon.com>\n"
-"Language-Team:  none\n"
+"Project-Id-Version: live-boot 4.0~a5-1\n"
+"POT-Creation-Date: 2013-02-12 08:28+0100\n"
+"PO-Revision-Date: 2013-01-08 14:00+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"
@@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-01-02"
-msgstr ""
+msgid "2013-02-12"
+msgstr "12.02.2013"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a4-1"
-msgstr "4.0~a4-1"
+msgid "4.0~a5-1"
+msgstr "4.0~a5-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
@@ -625,38 +625,22 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:103
 #, no-wrap
-msgid "B<noprompt>"
-msgstr "B<noprompt>"
+msgid "B<noeject>"
+msgstr "B<noeject>"
 
 #. type: Plain text
 #: en/live-boot.7:105
-msgid "Do not prompt to eject the CD or remove the USB flash drive on reboot."
-msgstr ""
-"No preguntar para expulsar el CD o extraer la unidad flash USB al reiniciar."
+msgid "Do not prompt to eject the live medium."
+msgstr "No pedir que se extraiga el dispositivo en vivo."
 
 #. type: IP
 #: en/live-boot.7:105
 #, no-wrap
-msgid "B<noprompt>=I<TYPE>"
-msgstr "B<noprompt>=I<TYPE>"
-
-#. type: Plain text
-#: en/live-boot.7:107
-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 ""
-"Indica a live-boot que no pregunte para expulsar el CD (usando noprompt=cd) "
-"o extraer la unidad flash USB (usando noprompt=usb) al reiniciar."
-
-#. type: IP
-#: en/live-boot.7:107
-#, no-wrap
 msgid "B<ramdisk-size>"
 msgstr "B<ramdisk-size>"
 
 #. type: Plain text
-#: en/live-boot.7:109
+#: en/live-boot.7:107
 msgid ""
 "This parameters allows to set a custom ramdisk size (it's the '-o size' "
 "option of tmpfs mount). By default, there is no ramdisk size set, so the "
@@ -670,24 +654,24 @@ msgstr ""
 "actualmente ningún efecto cuando se arranca con toram"
 
 #. type: IP
-#: en/live-boot.7:109
+#: en/live-boot.7:107
 #, no-wrap
 msgid "B<swapon>"
 msgstr "B<swapon>"
 
 #. type: Plain text
-#: en/live-boot.7:111
+#: en/live-boot.7:109
 msgid "This parameter enables usage of local swap partitions."
 msgstr "Este parámetro permite el uso de particiones swap locales."
 
 #. type: IP
-#: en/live-boot.7:111
+#: en/live-boot.7:109
 #, no-wrap
 msgid "B<persistence>"
 msgstr "B<persistence>"
 
 #. type: Plain text
-#: en/live-boot.7:113
+#: en/live-boot.7:111
 msgid ""
 "live-boot will probe devices for persistence media. These can be partitions "
 "(with the correct GPT name), filesystems (with the correct label) or image "
@@ -703,13 +687,13 @@ msgstr ""
 "sistema de ficheros, por ejemplo, \"persistence.ext4\"."
 
 #. type: IP
-#: en/live-boot.7:113
+#: en/live-boot.7:111
 #, no-wrap
 msgid "B<persistence-encryption>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
 msgstr "B<persistence-encryption>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
 
 #. type: Plain text
-#: en/live-boot.7:115
+#: en/live-boot.7:113
 msgid ""
 "This option determines which types of encryption that we allow to be used "
 "when probing devices for persistence media. If \"none\" is in the list, we "
@@ -725,13 +709,13 @@ msgstr ""
 "contraseña. Por defecto es \"none\"."
 
 #. type: IP
-#: en/live-boot.7:115
+#: en/live-boot.7:113
 #, no-wrap
 msgid "B<persistence-media>={I<removable>|I<removable-usb>}"
 msgstr "B<persistence-media>={I<removable>|I<removable-usb>}"
 
 #. type: Plain text
-#: en/live-boot.7:117
+#: en/live-boot.7:115
 msgid ""
 "If you specify the keyword 'removable', live-boot will try to find "
 "persistence partitions on removable media only. Note that if you want to "
@@ -744,13 +728,13 @@ msgstr ""
 "almacenamiento masivo USB se puede utilizar la palabra clave 'removable-usb'"
 
 #. type: IP
-#: en/live-boot.7:117
+#: en/live-boot.7:115
 #, no-wrap
 msgid "B<persistence-method>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
 msgstr "B<persistence-method>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
 
 #. type: Plain text
-#: en/live-boot.7:119
+#: en/live-boot.7:117
 msgid ""
 "This option determines which types of persistence media we allow. If "
 "\"overlay\" is in the list, we consider overlays (i.e. \"live-rw\" and "
@@ -761,13 +745,13 @@ msgstr ""
 "\"live-rw\" y \"home-rw\"). Por defecto es \"overlay\"."
 
 #. type: IP
-#: en/live-boot.7:119
+#: en/live-boot.7:117
 #, no-wrap
 msgid "B<persistence-path>=I<PATH>"
 msgstr "B<persistence-path>=I<PATH>"
 
 #. type: Plain text
-#: en/live-boot.7:121
+#: en/live-boot.7:119
 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 "
@@ -779,13 +763,13 @@ msgstr ""
 "con persistencia."
 
 #. type: IP
-#: en/live-boot.7:121
+#: en/live-boot.7:119
 #, no-wrap
 msgid "B<persistence-read-only>"
 msgstr "B<persistence-read-only>"
 
 #. type: Plain text
-#: en/live-boot.7:123
+#: en/live-boot.7:121
 msgid ""
 "Filesystem changes are not saved back to persistence media. In particular, "
 "overlays and netboot NFS mounts are mounted read-only."
@@ -795,13 +779,13 @@ msgstr ""
 "montados en sólo lectura."
 
 #. type: IP
-#: en/live-boot.7:123
+#: en/live-boot.7:121
 #, no-wrap
 msgid "B<persistence-storage>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
 msgstr "B<persistence-storage>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
 
 #. type: Plain text
-#: en/live-boot.7:125
+#: en/live-boot.7:123
 msgid ""
 "This option determines which types of persistence storage to consider when "
 "probing for persistence media. If \"filesystem\" is in the list, filesystems "
@@ -817,35 +801,27 @@ msgstr ""
 "etiquetas correspondientes. Por defecto es \"file,filesystem\". "
 
 #. type: IP
-#: en/live-boot.7:125
+#: en/live-boot.7:123
 #, no-wrap
-msgid "B<persistence-subtext>=I<SUFFIX>"
-msgstr "B<persistence-subtext>=I<SUFFIX>"
+msgid "B<persistence-label>=I<LABEL>"
+msgstr "B<persistence-label>=I<LABEL>"
 
 #. type: Plain text
-#: en/live-boot.7:127
+#: en/live-boot.7:125
 msgid ""
-"Add a suffix when searching for the image filenames or partition labels to "
-"use for the above mentioned persistence feature, the SUFFIX will be added "
-"after a dash (e.g.: \"live-sn\" would transform to \"live-sn-SUFFIX\"). This "
-"is handy to test multiple live-boot based live-systems with different "
-"persistence storage choices."
+"live-boot will use the name \"LABEL\" instead of \"persistence\" when "
+"searching for persistent storage. LABEL can be any valid filename, partition "
+"label, or GPT name."
 msgstr ""
-"Añadir un sufijo cuando se buscan los nombres de las imágenes o etiquetas de "
-"las particiones a utilizar para la función de la persistencia mencionada "
-"anteriormente, el SUFFIX se añadirá después de un guión (por ejemplo: \"live-"
-"sn\" se transformaría en \"live-sn-SUFFIX\"). Esto es útil para probar "
-"múltiples sistemas en vivo basados en live-boot con diferentes opciones de "
-"almacenamiento con persistencia."
 
 #. type: IP
-#: en/live-boot.7:127
+#: en/live-boot.7:125
 #, no-wrap
 msgid "B<quickreboot>"
 msgstr "B<quickreboot>"
 
 #. type: Plain text
-#: en/live-boot.7:129
+#: en/live-boot.7:127
 msgid ""
 "This option causes live-boot to reboot without attempting to eject the media "
 "and without asking the user to remove the boot media."
@@ -854,13 +830,13 @@ msgstr ""
 "sin pedirle al usuario que extraiga el dispositivo usado para arrancar."
 
 #. type: IP
-#: en/live-boot.7:129
+#: en/live-boot.7:127
 #, no-wrap
 msgid "B<showmounts>"
 msgstr "B<showmounts>"
 
 #. type: Plain text
-#: en/live-boot.7:131
+#: en/live-boot.7:129
 msgid ""
 "This parameter will make live-boot to show on \"/\" the ro filesystems "
 "(mostly compressed) on \"/lib/live\". This is not enabled by default because "
@@ -873,13 +849,13 @@ msgstr ""
 "que almacenan rutas binarias durante su instalación."
 
 #. type: IP
-#: en/live-boot.7:131
+#: en/live-boot.7:129
 #, no-wrap
 msgid "B<silent>"
 msgstr "B<silent>"
 
 #. type: Plain text
-#: en/live-boot.7:133
+#: en/live-boot.7:131
 msgid ""
 "If you boot with the normal quiet parameter, live-boot hides most messages "
 "of its own. When adding silent, it hides all."
@@ -888,13 +864,13 @@ msgstr ""
 "sus propios mensajes. Cuando se utiliza silent, los esconde todos."
 
 #. type: IP
-#: en/live-boot.7:133
+#: en/live-boot.7:131
 #, no-wrap
 msgid "B<todisk>=I<DEVICE>"
 msgstr "B<todisk>=I<DEVICE>"
 
 #. type: Plain text
-#: en/live-boot.7:135
+#: en/live-boot.7:133
 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 "
@@ -910,13 +886,13 @@ msgstr ""
 "utilizado esta vez."
 
 #. type: IP
-#: en/live-boot.7:135
+#: en/live-boot.7:133
 #, no-wrap
 msgid "B<toram>"
 msgstr "B<toram>"
 
 #. type: Plain text
-#: en/live-boot.7:137
+#: en/live-boot.7:135
 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 "
@@ -928,14 +904,14 @@ msgstr ""
 "espacio utilizado por los medios de sólo lectura."
 
 #. type: IP
-#: en/live-boot.7:137
+#: en/live-boot.7:135
 #, no-wrap
 msgid "B<union>=aufs|unionfs"
 msgstr "B<union>=aufs|unionfs"
 
 #.  FIXME
 #. type: Plain text
-#: en/live-boot.7:140
+#: en/live-boot.7:138
 msgid ""
 "By default, live-boot uses aufs. With this parameter, you can switch to "
 "unionfs."
@@ -945,19 +921,19 @@ msgstr ""
 
 #.  FIXME
 #. type: SH
-#: en/live-boot.7:142
+#: en/live-boot.7:140
 #, no-wrap
 msgid "FILES (old)"
 msgstr "FICHEROS (antiguos)"
 
 #. type: IP
-#: en/live-boot.7:143
+#: en/live-boot.7:141
 #, no-wrap
 msgid "B</etc/live.conf>"
 msgstr "B</etc/live.conf>"
 
 #. type: Plain text
-#: en/live-boot.7:145
+#: en/live-boot.7:143
 msgid ""
 "Some variables can be configured via this config file (inside the live "
 "system)."
@@ -966,14 +942,14 @@ msgstr ""
 "configuración (dentro del sistema en vivo)."
 
 #. type: IP
-#: en/live-boot.7:145
+#: en/live-boot.7:143
 #, no-wrap
 msgid "B<live/filesystem.module>"
 msgstr "B<live/filesystem.module>"
 
 #.  FIXME
 #. type: Plain text
-#: en/live-boot.7:148
+#: en/live-boot.7:146
 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 \"/"
@@ -995,75 +971,75 @@ msgstr ""
 "cargan en orden alfanumérico."
 
 #. type: SH
-#: en/live-boot.7:149
+#: en/live-boot.7:147
 #, no-wrap
 msgid "FILES"
 msgstr "FICHEROS"
 
 #. type: IP
-#: en/live-boot.7:150
+#: en/live-boot.7:148
 #, no-wrap
 msgid "B</etc/live/boot.conf>"
 msgstr "B</etc/live/boot.conf>"
 
 #. type: IP
-#: en/live-boot.7:151
+#: en/live-boot.7:149
 #, no-wrap
 msgid "B</etc/live/boot/*>"
 msgstr "B</etc/live/boot/*>"
 
 #. type: IP
-#: en/live-boot.7:152
+#: en/live-boot.7:150
 #, no-wrap
 msgid "B<live/boot.conf>"
 msgstr "B<live/boot.conf>"
 
 #. type: IP
-#: en/live-boot.7:153
+#: en/live-boot.7:151
 #, no-wrap
 msgid "B<live/boot/*>"
 msgstr "B<live/boot.d/*>"
 
 #. type: IP
-#: en/live-boot.7:154
+#: en/live-boot.7:152
 #, no-wrap
 msgid "B<persistence.conf>"
 msgstr "B<persistence.conf>"
 
 #. type: SH
-#: en/live-boot.7:156 en/persistence.conf.5:191
+#: en/live-boot.7:154 en/persistence.conf.5:191
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VER ADEMÁS"
 
 #. type: Plain text
-#: en/live-boot.7:158
+#: en/live-boot.7:156
 msgid "I<persistence.conf>(5)"
 msgstr "I<persistence.conf>(5)"
 
 #. type: Plain text
-#: en/live-boot.7:160 en/persistence.conf.5:195
+#: en/live-boot.7:158 en/persistence.conf.5:195
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
-#: en/live-boot.7:162 en/persistence.conf.5:197
+#: en/live-boot.7:160 en/persistence.conf.5:197
 msgid "I<live-config>(7)"
 msgstr "I<live-config>(7)"
 
 #. type: Plain text
-#: en/live-boot.7:164 en/persistence.conf.5:199
+#: en/live-boot.7:162 en/persistence.conf.5:199
 msgid "I<live-tools>(7)"
 msgstr "I<live-tools>(7)"
 
 #. type: SH
-#: en/live-boot.7:165 en/persistence.conf.5:200
+#: en/live-boot.7:163 en/persistence.conf.5:200
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "PÁGINA WEB"
 
 #. type: Plain text
-#: en/live-boot.7:167 en/persistence.conf.5:204
+#: en/live-boot.7:165 en/persistence.conf.5:204
 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 "
@@ -1074,13 +1050,13 @@ msgstr ""
 "E<lt>I<http://live.debian.net/manual/>E<gt>."
 
 #. type: SH
-#: en/live-boot.7:168 en/persistence.conf.5:205
+#: en/live-boot.7:166 en/persistence.conf.5:205
 #, no-wrap
 msgid "BUGS"
 msgstr "ERRORES"
 
 #. type: Plain text
-#: en/live-boot.7:170 en/persistence.conf.5:210
+#: en/live-boot.7:168 en/persistence.conf.5:210
 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 "
@@ -1093,13 +1069,13 @@ msgstr ""
 "Live a la dirección E<lt>I<debian-live@lists.debian.org>E<gt>."
 
 #. type: SH
-#: en/live-boot.7:171 en/persistence.conf.5:211
+#: en/live-boot.7:169 en/persistence.conf.5:211
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: en/live-boot.7:172
+#: en/live-boot.7:170
 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/es/persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po
index f7be839..df6db78 100644 (file)
--- a/manpages/po/es/persistence.conf.5.po
+++ b/manpages/po/es/persistence.conf.5.po
@@ -1,11 +1,11 @@
 # Spanish translations for live-boot package
-# Copyright (C) 2012 Carlos Zuferri «chals» <chals@altorricon.com>
+# Copyright (C) 2012-2013 Carlos Zuferri «chals» <chals@altorricon.com>
 # This file is distributed under the same license as the live-boot package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0~a4-1\n"
-"POT-Creation-Date: 2013-01-02 11:36+0100\n"
+"Project-Id-Version: live-boot 4.0~a5-1\n"
+"POT-Creation-Date: 2013-02-12 08:28+0100\n"
 "PO-Revision-Date: 2012-06-07 19:11+0200\n"
 "Last-Translator: Carlos Zuferri «chals» <chals@altorricon.com>\n"
 "Language-Team:  none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-01-02"
-msgstr ""
+msgid "2013-02-12"
+msgstr "12.02.2013"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a4-1"
-msgstr "4.0~a4-1"
+msgid "4.0~a5-1"
+msgstr "4.0~a5-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
@@ -57,34 +57,34 @@ msgid "OPTIONS"
 msgstr "OPCIONES"
 
 #. type: SH
-#: en/live-boot.7:156 en/persistence.conf.5:191
+#: en/live-boot.7:154 en/persistence.conf.5:191
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VER ADEMÁS"
 
 #. type: Plain text
-#: en/live-boot.7:160 en/persistence.conf.5:195
+#: en/live-boot.7:158 en/persistence.conf.5:195
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
-#: en/live-boot.7:162 en/persistence.conf.5:197
+#: en/live-boot.7:160 en/persistence.conf.5:197
 msgid "I<live-config>(7)"
 msgstr "I<live-config>(7)"
 
 #. type: Plain text
-#: en/live-boot.7:164 en/persistence.conf.5:199
+#: en/live-boot.7:162 en/persistence.conf.5:199
 msgid "I<live-tools>(7)"
 msgstr "I<live-tools>(7)"
 
 #. type: SH
-#: en/live-boot.7:165 en/persistence.conf.5:200
+#: en/live-boot.7:163 en/persistence.conf.5:200
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "PÁGINA WEB"
 
 #. type: Plain text
-#: en/live-boot.7:167 en/persistence.conf.5:204
+#: en/live-boot.7:165 en/persistence.conf.5:204
 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 "
@@ -95,13 +95,13 @@ msgstr ""
 "E<lt>I<http://live.debian.net/manual/>E<gt>."
 
 #. type: SH
-#: en/live-boot.7:168 en/persistence.conf.5:205
+#: en/live-boot.7:166 en/persistence.conf.5:205
 #, no-wrap
 msgid "BUGS"
 msgstr "ERRORES"
 
 #. type: Plain text
-#: en/live-boot.7:170 en/persistence.conf.5:210
+#: en/live-boot.7:168 en/persistence.conf.5:210
 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 "
@@ -114,7 +114,7 @@ msgstr ""
 "Live a la dirección E<lt>I<debian-live@lists.debian.org>E<gt>."
 
 #. type: SH
-#: en/live-boot.7:171 en/persistence.conf.5:211
+#: en/live-boot.7:169 en/persistence.conf.5:211
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"

diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 3cdc773..f13f15f 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-01-02 11:36+0100\n"
+"POT-Creation-Date: 2013-02-12 08:28+0100\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-01-02"
+msgid "2013-02-12"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a4-1"
+msgid "4.0~a5-1"
 msgstr ""
 
 #. type: TH
@@ -515,35 +515,22 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:103
 #, no-wrap
-msgid "B<noprompt>"
+msgid "B<noeject>"
 msgstr ""
 
 #. type: Plain text
 #: en/live-boot.7:105
-msgid "Do not prompt to eject the CD or remove the USB flash drive on reboot."
+msgid "Do not prompt to eject the live medium."
 msgstr ""
 
 #. type: IP
 #: en/live-boot.7:105
 #, no-wrap
-msgid "B<noprompt>=I<TYPE>"
-msgstr ""
-
-#. type: Plain text
-#: en/live-boot.7:107
-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:107
-#, no-wrap
 msgid "B<ramdisk-size>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:109
+#: en/live-boot.7:107
 msgid ""
 "This parameters allows to set a custom ramdisk size (it's the '-o size' "
 "option of tmpfs mount). By default, there is no ramdisk size set, so the "
@@ -552,24 +539,24 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:109
+#: en/live-boot.7:107
 #, no-wrap
 msgid "B<swapon>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:111
+#: en/live-boot.7:109
 msgid "This parameter enables usage of local swap partitions."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:111
+#: en/live-boot.7:109
 #, no-wrap
 msgid "B<persistence>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:113
+#: en/live-boot.7:111
 msgid ""
 "live-boot will probe devices for persistence media. These can be partitions "
 "(with the correct GPT name), filesystems (with the correct label) or image "
@@ -579,13 +566,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:113
+#: en/live-boot.7:111
 #, no-wrap
 msgid "B<persistence-encryption>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:115
+#: en/live-boot.7:113
 msgid ""
 "This option determines which types of encryption that we allow to be used "
 "when probing devices for persistence media. If \"none\" is in the list, we "
@@ -595,13 +582,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:115
+#: en/live-boot.7:113
 #, no-wrap
 msgid "B<persistence-media>={I<removable>|I<removable-usb>}"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:117
+#: en/live-boot.7:115
 msgid ""
 "If you specify the keyword 'removable', live-boot will try to find "
 "persistence partitions on removable media only. Note that if you want to "
@@ -610,13 +597,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:117
+#: en/live-boot.7:115
 #, no-wrap
 msgid "B<persistence-method>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:119
+#: en/live-boot.7:117
 msgid ""
 "This option determines which types of persistence media we allow. If "
 "\"overlay\" is in the list, we consider overlays (i.e. \"live-rw\" and "
@@ -624,13 +611,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:119
+#: en/live-boot.7:117
 #, no-wrap
 msgid "B<persistence-path>=I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:121
+#: en/live-boot.7:119
 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 "
@@ -638,26 +625,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:121
+#: en/live-boot.7:119
 #, no-wrap
 msgid "B<persistence-read-only>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:123
+#: en/live-boot.7:121
 msgid ""
 "Filesystem changes are not saved back to persistence media. In particular, "
 "overlays and netboot NFS mounts are mounted read-only."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:123
+#: en/live-boot.7:121
 #, no-wrap
 msgid "B<persistence-storage>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:125
+#: en/live-boot.7:123
 msgid ""
 "This option determines which types of persistence storage to consider when "
 "probing for persistence media. If \"filesystem\" is in the list, filesystems "
@@ -667,42 +654,40 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:125
+#: en/live-boot.7:123
 #, no-wrap
-msgid "B<persistence-subtext>=I<SUFFIX>"
+msgid "B<persistence-label>=I<LABEL>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:127
+#: en/live-boot.7:125
 msgid ""
-"Add a suffix when searching for the image filenames or partition labels to "
-"use for the above mentioned persistence feature, the SUFFIX will be added "
-"after a dash (e.g.: \"live-sn\" would transform to \"live-sn-SUFFIX\"). This "
-"is handy to test multiple live-boot based live-systems with different "
-"persistence storage choices."
+"live-boot will use the name \"LABEL\" instead of \"persistence\" when "
+"searching for persistent storage. LABEL can be any valid filename, partition "
+"label, or GPT name."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:127
+#: en/live-boot.7:125
 #, no-wrap
 msgid "B<quickreboot>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:129
+#: en/live-boot.7:127
 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:129
+#: en/live-boot.7:127
 #, no-wrap
 msgid "B<showmounts>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:131
+#: en/live-boot.7:129
 msgid ""
 "This parameter will make live-boot to show on \"/\" the ro filesystems "
 "(mostly compressed) on \"/lib/live\". This is not enabled by default because "
@@ -711,26 +696,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:131
+#: en/live-boot.7:129
 #, no-wrap
 msgid "B<silent>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:133
+#: en/live-boot.7:131
 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:133
+#: en/live-boot.7:131
 #, no-wrap
 msgid "B<todisk>=I<DEVICE>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:135
+#: en/live-boot.7:133
 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 "
@@ -740,13 +725,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:135
+#: en/live-boot.7:133
 #, no-wrap
 msgid "B<toram>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:137
+#: en/live-boot.7:135
 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 "
@@ -754,14 +739,14 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:137
+#: en/live-boot.7:135
 #, no-wrap
 msgid "B<union>=aufs|unionfs"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-boot.7:140
+#: en/live-boot.7:138
 msgid ""
 "By default, live-boot uses aufs. With this parameter, you can switch to "
 "unionfs."
@@ -769,33 +754,33 @@ msgstr ""
 
 #.  FIXME
 #. type: SH
-#: en/live-boot.7:142
+#: en/live-boot.7:140
 #, no-wrap
 msgid "FILES (old)"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:143
+#: en/live-boot.7:141
 #, no-wrap
 msgid "B</etc/live.conf>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:145
+#: en/live-boot.7:143
 msgid ""
 "Some variables can be configured via this config file (inside the live "
 "system)."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:145
+#: en/live-boot.7:143
 #, no-wrap
 msgid "B<live/filesystem.module>"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-boot.7:148
+#: en/live-boot.7:146
 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 \"/"
@@ -808,75 +793,75 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:149
+#: en/live-boot.7:147
 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:150
+#: en/live-boot.7:148
 #, no-wrap
 msgid "B</etc/live/boot.conf>"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:151
+#: en/live-boot.7:149
 #, no-wrap
 msgid "B</etc/live/boot/*>"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:152
+#: en/live-boot.7:150
 #, no-wrap
 msgid "B<live/boot.conf>"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:153
+#: en/live-boot.7:151
 #, no-wrap
 msgid "B<live/boot/*>"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:154
+#: en/live-boot.7:152
 #, no-wrap
 msgid "B<persistence.conf>"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:156 en/persistence.conf.5:191
+#: en/live-boot.7:154 en/persistence.conf.5:191
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:158
+#: en/live-boot.7:156
 msgid "I<persistence.conf>(5)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:160 en/persistence.conf.5:195
+#: en/live-boot.7:158 en/persistence.conf.5:195
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:162 en/persistence.conf.5:197
+#: en/live-boot.7:160 en/persistence.conf.5:197
 msgid "I<live-config>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:164 en/persistence.conf.5:199
+#: en/live-boot.7:162 en/persistence.conf.5:199
 msgid "I<live-tools>(7)"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:165 en/persistence.conf.5:200
+#: en/live-boot.7:163 en/persistence.conf.5:200
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:167 en/persistence.conf.5:204
+#: en/live-boot.7:165 en/persistence.conf.5:204
 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 "
@@ -884,13 +869,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:168 en/persistence.conf.5:205
+#: en/live-boot.7:166 en/persistence.conf.5:205
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:170 en/persistence.conf.5:210
+#: en/live-boot.7:168 en/persistence.conf.5:210
 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 "
@@ -899,13 +884,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:171 en/persistence.conf.5:211
+#: en/live-boot.7:169 en/persistence.conf.5:211
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:172
+#: en/live-boot.7:170
 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/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot
index b26187d..ce32c98 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-01-02 11:36+0100\n"
+"POT-Creation-Date: 2013-02-12 08:28+0100\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-01-02"
+msgid "2013-02-12"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a4-1"
+msgid "4.0~a5-1"
 msgstr ""
 
 #. type: TH
@@ -59,34 +59,34 @@ msgid "OPTIONS"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:156 en/persistence.conf.5:191
+#: en/live-boot.7:154 en/persistence.conf.5:191
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:160 en/persistence.conf.5:195
+#: en/live-boot.7:158 en/persistence.conf.5:195
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:162 en/persistence.conf.5:197
+#: en/live-boot.7:160 en/persistence.conf.5:197
 msgid "I<live-config>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:164 en/persistence.conf.5:199
+#: en/live-boot.7:162 en/persistence.conf.5:199
 msgid "I<live-tools>(7)"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:165 en/persistence.conf.5:200
+#: en/live-boot.7:163 en/persistence.conf.5:200
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:167 en/persistence.conf.5:204
+#: en/live-boot.7:165 en/persistence.conf.5:204
 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 "
@@ -94,13 +94,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:168 en/persistence.conf.5:205
+#: en/live-boot.7:166 en/persistence.conf.5:205
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:170 en/persistence.conf.5:210
+#: en/live-boot.7:168 en/persistence.conf.5:210
 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 "
@@ -109,7 +109,7 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:171 en/persistence.conf.5:211
+#: en/live-boot.7:169 en/persistence.conf.5:211
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""

diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh
index c696781..fd10e5d 100755 (executable)
--- a/scripts/boot/9990-main.sh
+++ b/scripts/boot/9990-main.sh
@@ -135,6 +135,19 @@ Main ()
                mount_images_in_directory "${livefs_root}" "${rootmnt}" "${mac}"
        fi
 
+       # At this point /root should contain the final root filesystem.
+       # Move all mountpoints below /live into /root/lib/live/mount.
+       # This has to be done after mounting the root filesystem to /
+       # otherwise these mount points won't be accessible from the running system.
+       for _MOUNT in $(cat /proc/mounts | cut -f 2 -d " " | grep -e "^/live/")
+       do
+               local newmount
+               newmount="${rootmnt}/lib/live/mount/${_MOUNT#/live/}"
+               mkdir -p "${newmount}"
+               mount -o move "${_MOUNT}" "${newmount}" > /dev/null 2>&1 || \
+               mount -o bind "${_MOUNT}" "${newmount}" > /dev/null || \
+               log_warning_msg "W: failed to move or bindmount ${_MOUNT} to ${newmount}"
+       done
 
        if [ -n "${ROOT_PID}" ]
        then
@@ -151,9 +164,6 @@ Main ()
                        ;;
        esac
 
-       # Move to the new root filesystem so that programs there can get at it.
-       mkdir -p /root/lib/live/mount/medium
-       mount --move /live/medium /root/lib/live/mount/medium
 
        # aufs2 in kernel versions around 2.6.33 has a regression:
        # directories can't be accessed when read for the first the time,
@@ -161,13 +171,6 @@ Main ()
        # when booting FAI, this simple workaround solves it
        ls /root/* >/dev/null 2>&1
 
-       # Move findiso directory to the new root filesystem so that programs there can get at it.
-       if [ -d /live/findiso ]
-       then
-               mkdir -p /root/lib/live/mount/findiso
-               mount -n --move /live/findiso /root/lib/live/mount/findiso
-       fi
-
        # if we do not unmount the ISO we can't run "fsck /dev/ice" later on
        # because the mountpoint is left behind in /proc/mounts, so let's get
        # rid of it when running from RAM

diff --git a/scripts/boot/9990-misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh
index 356fe6d..18befee 100755 (executable)
--- a/scripts/boot/9990-misc-helpers.sh
+++ b/scripts/boot/9990-misc-helpers.sh
@@ -591,7 +591,7 @@ fs_size ()
                size=$(expr ${size} + ${size} / 20 ) # FIXME: 5% more to be sure
        else
                # free space
-               size="$(df -k | grep -s ${mountp} | awk '{print $4}')"
+               size="$(df -kP | grep -s ${mountp} | awk '{print $4}')"
        fi
 
        if [ -n "${doumount}" ]
@@ -733,7 +733,7 @@ mount_persistence_media ()
        device=${1}
        probe=${2}
 
-       backing="${rootmnt}/lib/live/mount/persistence/$(basename ${device})"
+       backing="/live/persistence/$(basename ${device})"
 
        mkdir -p "${backing}"
        old_backing="$(where_is_mounted ${device})"
@@ -957,7 +957,7 @@ find_persistence_media ()
        white_listed_devices="${2}"
        ret=""
 
-       black_listed_devices="$(what_is_mounted_on ${rootmnt}/lib/live/medium)"
+       black_listed_devices="$(what_is_mounted_on /live/medium)"
 
        for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}")
        do
@@ -1188,11 +1188,12 @@ link_files ()
 
 do_union ()
 {
-       local unionmountpoint unionrw unionro1 unionro2
+       local unionmountpoint unionrw unionro
        unionmountpoint="${1}"  # directory where the union is mounted
-       unionrw="${2}"          # branch where the union changes are stored
-       unionro1="${3}"         # first underlying read-only branch (optional)
-       unionro2="${4}"         # second underlying read-only branch (optional)
+       shift
+       unionrw="${1}"          # branch where the union changes are stored
+       shift
+       unionro="${*}"          # space separated list of read-only branches (optional)
 
        case "${UNIONTYPE}" in
                aufs)
@@ -1216,13 +1217,12 @@ do_union ()
                unionfs-fuse)
                        unionmountopts="-o cow -o noinitgroups -o default_permissions -o allow_other -o use_ino -o suid"
                        unionmountopts="${unionmountopts} ${unionrw}=${rw_opt}"
-                       if [ -n "${unionro1}" ]
-                       then
-                               unionmountopts="${unionmountopts}:${unionro1}=${ro_opt}"
-                       fi
-                       if [ -n "${unionro2}" ]
+                       if [ -n "${unionro}" ]
                        then
-                               unionmountopts="${unionmountopts}:${unionro2}=${ro_opt}"
+                               for rofs in ${unionro}
+                               do
+                                       unionmountopts="${unionmountopts}:${rofs}=${ro_opt}"
+                               done
                        fi
                        ( sysctl -w fs.file-max=391524 ; ulimit -HSn 16384
                        unionfs-fuse ${unionmountopts} "${unionmountpoint}" ) && \
@@ -1231,21 +1231,27 @@ do_union ()
                        ;;
 
                overlayfs)
-                       # XXX: can unionro2 be used? (overlayfs only handles two dirs, but perhaps they can be chained?)
-                       # XXX: and can unionro1 be optional? i.e. can overlayfs skip lowerdir?
-                       unionmountopts="-o noatime,lowerdir=${unionro1},upperdir=${unionrw}"
+                       # XXX: can multiple unionro be used? (overlayfs only handles two dirs, but perhaps they can be chained?)
+                       # XXX: and can unionro be optional? i.e. can overlayfs skip lowerdir?
+                       if echo ${unionro} | grep -q " "
+                       then
+                               panic "Multiple lower filesystems are currently not supported with overlayfs (unionro = ${unionro})."
+                       elif [ -z "${unionro}"  ]
+                       then
+                               panic "Overlayfs needs at least one lower filesystem (read-only branch)."
+                       fi
+                       unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}"
                        mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
                        ;;
 
                *)
                        unionmountopts="-o noatime,${noxino_opt},dirs=${unionrw}=${rw_opt}"
-                       if [ -n "${unionro1}" ]
-                       then
-                               unionmountopts="${unionmountopts}:${unionro1}=${ro_opt}"
-                       fi
-                       if [ -n "${unionro2}" ]
+                       if [ -n "${unionro}" ]
                        then
-                               unionmountopts="${unionmountopts}:${unionro2}=${ro_opt}"
+                               for rofs in ${unionro}
+                               do
+                                       unionmountopts="${unionmountopts}:${rofs}=${ro_opt}"
+                               done
                        fi
                        mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
                        ;;
@@ -1254,7 +1260,7 @@ do_union ()
 
 get_custom_mounts ()
 {
-       # Side-effect: leaves $devices with persistence.conf mounted in ${rootmnt}/lib/live/mount/persistence
+       # Side-effect: leaves $devices with persistence.conf mounted in /live/persistence
        # Side-effect: prints info to file $custom_mounts
 
        local custom_mounts devices bindings links
@@ -1293,7 +1299,7 @@ get_custom_mounts ()
 
                if [ -n "${DEBUG}" ] && [ -e "${include_list}" ]
                then
-                       cp ${include_list} ${rootmnt}/lib/live/mount/persistence/${persistence_list}.${device_name}
+                       cp ${include_list} /live/persistence/${persistence_list}.${device_name}
                fi
 
                while read dir options # < ${include_list}
@@ -1478,19 +1484,17 @@ activate_custom_mounts ()
                rootfs_dest_backing=""
                if [ -n "${opt_link}"]
                then
-                       for d in ${rootmnt}/lib/live/mount/rootfs/*
+                       for d in /live/rootfs/*
                        do
                                if [ -n "${rootmnt}" ]
                                then
-                                       rootfs_dest_backing="${d}/$(echo ${dest} | sed -e "s|${rootmnt}||")"
+                                       fs="${d}/$(echo ${dest} | sed -e "s|${rootmnt}||")"
                                else
-                                       rootfs_dest_backing="${d}/${dest}"
+                                       fs="${d}/${dest}"
                                fi
-                               if [ -d "${rootfs_dest_backing}" ]
+                               if [ -d "${fs}" ]
                                then
-                                       break
-                               else
-                                       rootfs_dest_backing=""
+                                       rootfs_dest_backing="${rootfs_dest_backing} ${fs}"
                                fi
                        done
                fi
@@ -1510,7 +1514,7 @@ activate_custom_mounts ()
                        # has its own directory and isn't nested with some
                        # other custom mount (if so that mount's files would
                        # be linked, causing breakage.
-                       cow_dir="${rootmnt}/lib/live/mount/overlay/lib/live/mount/persistence/$(basename ${links_source})"
+                       cow_dir="/live/overlay/lib/live/mount/persistence/$(basename ${links_source})"
                        mkdir -p ${cow_dir}
                        chown_ref "${source}" "${cow_dir}"
                        chmod_ref "${source}" "${cow_dir}"
@@ -1527,7 +1531,7 @@ activate_custom_mounts ()
                        # bind-mount and union mount are handled the same
                        # in read-only mode, but note that rootfs_dest_backing
                        # is non-empty (and necessary) only for unions
-                       cow_dir="${rootmnt}/lib/live/mount/overlay/${dest}"
+                       cow_dir="/live/overlay/${dest}"
                        if [ -e "${cow_dir}" ] && [ -z "${opt_link}" ]
                        then
                                # If an earlier custom mount has files here

diff --git a/scripts/boot/9990-netbase.sh b/scripts/boot/9990-netbase.sh
index 64e30df..b3f886c 100755 (executable)
--- a/scripts/boot/9990-netbase.sh
+++ b/scripts/boot/9990-netbase.sh
@@ -135,20 +135,5 @@ EOF
                fi
        fi
 
-       #if [ ! -x /root/usr/sbin/NetworkManager ]
-       #then
-       #       for i in eth0 eth1 eth2 ath0 wlan0
-       #       do
-       #               grep -q "iface ${i}" ${IFFILE} && continue
-       #
-       #cat >> "${IFFILE}" << EOF
-       #allow-hotplug ${i}
-       #iface ${i} inet dhcp
-       #
-       #EOF
-       #
-       #       done
-       #fi
-
        log_end_msg
 }

diff --git a/scripts/boot/9990-overlay.sh b/scripts/boot/9990-overlay.sh
index b4f5082..71e9a74 100755 (executable)
--- a/scripts/boot/9990-overlay.sh
+++ b/scripts/boot/9990-overlay.sh
@@ -371,29 +371,6 @@ setup_unionfs ()
                esac
        done
 
-       # move all /live mountpoints that the custom persistence
-       # system depends on into /lib/live on the root filesystem
-       for _DIRECTORY in rootfs
-       do
-               if [ -d "/live/${_DIRECTORY}" ]
-               then
-                       mkdir -p "${rootmnt}/lib/live/mount/${_DIRECTORY}"
-
-                       for _MOUNT in $(ls /live/${_DIRECTORY})
-                       do
-                               mkdir -p "${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}"
-                               mount -o move "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}" > /dev/null 2>&1 || \
-                                       mount -o bind "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}" || \
-                                       log_warning_msg "W: failed to mount /live/${_DIRECTORY}/${_MOUNT} to ${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}"
-                       done
-               fi
-       done
-
-       mkdir -p "${rootmnt}/lib/live/mount/overlay"
-       mount -o move /live/overlay "${rootmnt}/lib/live/mount/overlay" > /dev/null 2>&1 || \
-               mount -o bind /live/overlay "${rootmnt}/lib/live/mount/overlay" || \
-               log_warning_msg "W: failed to mount /live/overlay to ${rootmnt}/lib/live/mount/overlay"
-
        # Adding custom persistence
        if [ -n "${PERSISTENCE}" ] && [ -z "${NOPERSISTENCE}" ]
        then