Correcting persistence-label handling fwrt/ legacy live-boot 2.x support, thanks...

diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index bf4f359..7eabab3 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 08.01.2013 3.0~b11\-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 12.02.2013 3.0~b11\-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Scripts
@@ -207,12 +207,13 @@ 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. This option replaces the less flexible persistent\-subtext option
+from version 2 of live\-boot. If you wish to continue using legacy names for
+persistent storage, use the full name with this option,
+e.g. persistence\-label=live\-rw\-foo
 .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 85dd9c3..e657a22 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 08.01.2013 3.0~b11\-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 12.02.2013 3.0~b11\-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 88bf411..2a51a1a 100644 (file)
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2013\-01\-08 3.0~b11-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2013\-02\-12 3.0~b11-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts
@@ -120,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. This option replaces the less flexible persistent\-subtext option from version 2 of live-boot. If you wish to continue using legacy names for persistent storage, use the full name with this option, e.g. persistence\-label=live-rw-foo
 .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 33a477f..7554423 100644 (file)
--- a/manpages/en/persistence.conf.5
+++ b/manpages/en/persistence.conf.5
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2013\-01\-08 3.0~b11-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2013\-02\-12 3.0~b11-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 5f90691..bfdc5d6 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 08.01.2013 3.0~b11\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT 7 12.02.2013 3.0~b11\-1 "Proyecto Debian Live"
 
 .SH NOMBRE
 \fBlive\-boot\fP \- Scripts de Arranque del Sistema
@@ -222,13 +222,13 @@ 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. This option replaces the less flexible persistent\-subtext option
+from version 2 of live\-boot. If you wish to continue using legacy names for
+persistent storage, use the full name with this option,
+e.g. persistence\-label=live\-rw\-foo
 .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 a5eeaac..a05c2f6 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 08.01.2013 3.0~b11\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT conf 12.02.2013 3.0~b11\-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 0be28c7..734b448 100644 (file)
--- a/manpages/po/de/live-boot.7.po
+++ b/manpages/po/de/live-boot.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 3.0~b11-1\n"
-"POT-Creation-Date: 2013-01-02 11:31+0100\n"
+"POT-Creation-Date: 2013-02-12 08:20+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,8 +24,8 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-01-08"
-msgstr "08.01.2013"
+msgid "2013-02-12"
+msgstr "12.02.2013"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
@@ -655,17 +655,18 @@ msgstr ""
 #. type: IP
 #: 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: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. This option replaces the less flexible persistent-"
+"subtext option from version 2 of live-boot. If you wish to continue using "
+"legacy names for persistent storage, use the full name with this option, e."
+"g. persistence-label=live-rw-foo"
 msgstr ""
 
 #. type: IP

diff --git a/manpages/po/de/persistence.conf.5.po b/manpages/po/de/persistence.conf.5.po
index ebf87ab..6b9761d 100644 (file)
--- a/manpages/po/de/persistence.conf.5.po
+++ b/manpages/po/de/persistence.conf.5.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 3.0~b11-1\n"
-"POT-Creation-Date: 2013-01-02 11:31+0100\n"
+"POT-Creation-Date: 2013-02-12 08:20+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,8 +24,8 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-01-08"
-msgstr "08.01.2013"
+msgid "2013-02-12"
+msgstr "12.02.2013"
 
 #. 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 4a7626d..95d4731 100644 (file)
--- a/manpages/po/es/live-boot.7.po
+++ b/manpages/po/es/live-boot.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 3.0~b11-1\n"
-"POT-Creation-Date: 2013-01-02 11:31+0100\n"
+"POT-Creation-Date: 2013-02-12 08:20+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"
@@ -24,8 +24,8 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-01-08"
-msgstr "08.01.2013"
+msgid "2013-02-12"
+msgstr "12.02.2013"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
@@ -803,24 +803,19 @@ msgstr ""
 #. type: IP
 #: 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: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. This option replaces the less flexible persistent-"
+"subtext option from version 2 of live-boot. If you wish to continue using "
+"legacy names for persistent storage, use the full name with this option, e."
+"g. persistence-label=live-rw-foo"
 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:125

diff --git a/manpages/po/es/persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po
index fe3a38a..5284c4c 100644 (file)
--- a/manpages/po/es/persistence.conf.5.po
+++ b/manpages/po/es/persistence.conf.5.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 3.0~b11-1\n"
-"POT-Creation-Date: 2013-01-02 11:31+0100\n"
+"POT-Creation-Date: 2013-02-12 08:20+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,8 +23,8 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-01-08"
-msgstr "08.01.2013"
+msgid "2013-02-12"
+msgstr "12.02.2013"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1

diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index a571b87..346f91a 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:31+0100\n"
+"POT-Creation-Date: 2013-02-12 08:20+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,7 +25,7 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-01-08"
+msgid "2013-02-12"
 msgstr ""
 
 #. type: TH
@@ -656,17 +656,18 @@ msgstr ""
 #. type: IP
 #: 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: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. This option replaces the less flexible persistent-"
+"subtext option from version 2 of live-boot. If you wish to continue using "
+"legacy names for persistent storage, use the full name with this option, e."
+"g. persistence-label=live-rw-foo"
 msgstr ""
 
 #. type: IP

diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot
index e4637bb..db85fe1 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:31+0100\n"
+"POT-Creation-Date: 2013-02-12 08:20+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,7 +25,7 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-01-08"
+msgid "2013-02-12"
 msgstr ""
 
 #. type: TH

diff --git a/scripts/boot/9990-cmdline-old b/scripts/boot/9990-cmdline-old
index 85f1b62..b8fc4a6 100755 (executable)
--- a/scripts/boot/9990-cmdline-old
+++ b/scripts/boot/9990-cmdline-old
@@ -188,8 +188,6 @@ Cmdline_old ()
                                ;;
 
                        persistence-label=*)
-                               old_root_overlay_label="${_PARAMETER#persistence-label=*}"
-                               old_home_overlay_label="${_PARAMETER#persistence-label=*}"
                                custom_overlay_label="${_PARAMETER#persistence-label=*}"
                                ;;