From 59a83cb48cd1c0f602be3927d8f746b599c4dafe Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 6 Jun 2012 19:02:00 +0200 Subject: [PATCH] Setting persistence label for live-* 3.x persistency to 'persistence', we're not making any difference between full-ov and custom-ov anymore on the filesystem and partition label (it's determined by the contents of live-persistence.conf). --- manpages/de/live-boot.de.7 | 8 ++--- manpages/de/live-persistence.conf.de.5 | 15 ++++----- manpages/en/live-boot.7 | 2 +- manpages/en/live-persistence.conf.5 | 6 ++-- manpages/es/live-boot.es.7 | 8 ++--- manpages/es/live-persistence.conf.es.5 | 30 ++++++++--------- manpages/po/de/live-boot.7.po | 10 +++--- manpages/po/de/live-persistence.conf.5.po | 35 ++++++++++---------- manpages/po/es/live-boot.7.po | 10 +++--- manpages/po/es/live-persistence.conf.5.po | 53 ++++++++++++++++++++----------- manpages/pot/live-boot.7.pot | 10 +++--- manpages/pot/live-persistence.conf.5.pot | 35 ++++++++++---------- scripts/boot.sh | 2 +- 13 files changed, 112 insertions(+), 112 deletions(-) diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 index 520277a..c878e8f 100644 --- a/manpages/de/live-boot.de.7 +++ b/manpages/de/live-boot.de.7 @@ -179,11 +179,9 @@ This parameter enables usage of local swap partitions. .IP \fBpersistence\fP 4 live\-boot will probe devices for persistence media. These can be partitions (with the correct GPT name), filesystems (with the correct label) or image -files (with the correct file name). Overlays are labeled/named either -"full\-ov", which will be mounted on /, or "custom\-ov", which can be -completely customized (see \fIlive\-persistence.conf\fP(5)). The order these are -handled are: full\-ov, custom\-ov. Overlay image files have extensions which -determines their filesystem, e.g. "custom\-ov.ext4". +files (with the correct file name). Overlays are labeled/named "persistence" +(see \fIlive\-persistence.conf\fP(5)). Overlay image files have extensions which +determines their filesystem, e.g. "persistence.ext4". .IP "\fBpersistence\-encryption\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4 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 diff --git a/manpages/de/live-persistence.conf.de.5 b/manpages/de/live-persistence.conf.de.5 index 298abef..1728643 100644 --- a/manpages/de/live-persistence.conf.de.5 +++ b/manpages/de/live-persistence.conf.de.5 @@ -11,7 +11,7 @@ live\-boot .SH DESCRIPTION If live\-boot probes a persistence volume with the label (or GPT name, or -file name, but from now on we will just say "label") "custom\-ov", that +file name, but from now on we will just say "label") "persistence", that volume's persistence is fully customizable through the \fBlive\-persistence.conf\fP file stored on the root of its file system. Any such labeled volume must have such a file, or it will be ignored. @@ -29,13 +29,12 @@ the list of \fIOPTION\fPs". .PP For each custom mount \fIDIR\fP must be an absolute path that cannot contain white spaces or the special . and .. path components, and cannot be /live -(or any of its sub\-directories), or / (for the latter, use "full\-ov" -persistence instead). Once activated all changes (file deletion, creation -and modification) to \fIDIR\fP on the live file system are stored persistently -into a path equivalent to \fIDIR\fP on the persistence media, called the source -directory. The default way to achieve persistence is to simply bind\-mount -the corresponding source directory to \fIDIR\fP, but this can be changed -through the use of \fIOPTION\fPs. +(or any of its sub\-directories). Once activated all changes (file deletion, +creation and modification) to \fIDIR\fP on the live file system are stored +persistently into a path equivalent to \fIDIR\fP on the persistence media, +called the source directory. The default way to achieve persistence is to +simply bind\-mount the corresponding source directory to \fIDIR\fP, but this can +be changed through the use of \fIOPTION\fPs. .PP All custom mounts will be done in an order so that no two custom mounts can "hide" each other. For instance, if we have the two \fIDIR\fP:s /a and /a/b it diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7 index 516b189..4f25b61 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -109,7 +109,7 @@ This parameters allows to set a custom ramdisk size (it's the '\-o size' option .IP "\fBswapon\fR" 4 This parameter enables usage of local swap partitions. .IP "\fBpersistence\fR" 4 -live\-boot will probe devices for persistence media. These can be partitions (with the correct GPT name), filesystems (with the correct label) or image files (with the correct file name). Overlays are labeled/named either "full\-ov", which will be mounted on /, or "custom\-ov", which can be completely customized (see \fIlive-persistence.conf\fR(5)). The order these are handled are: full\-ov, custom\-ov. Overlay image files have extensions which determines their filesystem, e.g. "custom\-ov.ext4". +live\-boot will probe devices for persistence media. These can be partitions (with the correct GPT name), filesystems (with the correct label) or image files (with the correct file name). Overlays are labeled/named "persistence" (see \fIlive-persistence.conf\fR(5)). Overlay image files have extensions which determines their filesystem, e.g. "persistence.ext4". .IP "\fBpersistence\-encryption\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4 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 allow unencrypted media; if "luks" is in the list, we allow LUKS\-encrypted media. Whenever a device containing encrypted media is probed the user will be prompted for the passphrase. The default value is "none". .IP "\fBpersistence\-media\fR={\fIremovable\fR|\fIremovable\-usb\fR}" 4 diff --git a/manpages/en/live-persistence.conf.5 b/manpages/en/live-persistence.conf.5 index 194826d..eddb8be 100644 --- a/manpages/en/live-persistence.conf.5 +++ b/manpages/en/live-persistence.conf.5 @@ -6,7 +6,7 @@ live\-boot .SH DESCRIPTION If live-boot probes a persistence volume with the label (or GPT name, -or file name, but from now on we will just say "label") "custom\-ov", +or file name, but from now on we will just say "label") "persistence", that volume's persistence is fully customizable through the \fBlive-persistence.conf\fR file stored on the root of its file system. Any such labeled volume must have such a file, or it will be ignored. @@ -24,8 +24,8 @@ described by the list of \fIOPTION\fRs". .PP For each custom mount \fIDIR\fR must be an absolute path that cannot contain white spaces or the special . and .. path components, and -cannot be /live (or any of its sub-directories), or / (for the latter, -use "full-ov" persistence instead). Once activated all changes (file +cannot be /live (or any of its sub-directories). +Once activated all changes (file deletion, creation and modification) to \fIDIR\fR on the live file system are stored persistently into a path equivalent to \fIDIR\fR on the persistence media, called the source directory. The default way to diff --git a/manpages/es/live-boot.es.7 b/manpages/es/live-boot.es.7 index 20b7358..a87a629 100644 --- a/manpages/es/live-boot.es.7 +++ b/manpages/es/live-boot.es.7 @@ -189,11 +189,9 @@ Este parámetro permite el uso de particiones swap locales. .IP \fBpersistence\fP 4 live\-boot will probe devices for persistence media. These can be partitions (with the correct GPT name), filesystems (with the correct label) or image -files (with the correct file name). Overlays are labeled/named either -"full\-ov", which will be mounted on /, or "custom\-ov", which can be -completely customized (see \fIlive\-persistence.conf\fP(5)). The order these are -handled are: full\-ov, custom\-ov. Overlay image files have extensions which -determines their filesystem, e.g. "custom\-ov.ext4". +files (with the correct file name). Overlays are labeled/named "persistence" +(see \fIlive\-persistence.conf\fP(5)). Overlay image files have extensions which +determines their filesystem, e.g. "persistence.ext4". .IP "\fBpersistence\-encryption\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4 Esta opción determina qué tipo de cifrado se usa cuando se prueban los dispositivos de los medios con persistencia. Si se especifica "none" en la diff --git a/manpages/es/live-persistence.conf.es.5 b/manpages/es/live-persistence.conf.es.5 index e5b583e..c9890a2 100644 --- a/manpages/es/live-persistence.conf.es.5 +++ b/manpages/es/live-persistence.conf.es.5 @@ -10,12 +10,11 @@ con persistencia en live\-boot .SH DESCRIPCIÓN -Si live\-boot prueba un volumen persistente con la etiqueta (o nombre GPT, o -nombre de fichero, aunque a partir de este momento nos referiremos a él como -simplemente "etiqueta") "custom\-ov", la persistencia de ese volumen es -completamente personalizable a través del fichero \fBlive\-persistence.conf\fP -almacenado en la raíz de su sistema de ficheros. Cualquier volumen con una -de esas etiquetas debe tener uno de esos ficheros, o si no será ignorado. +If live\-boot probes a persistence volume with the label (or GPT name, or +file name, but from now on we will just say "label") "persistence", that +volume's persistence is fully customizable through the +\fBlive\-persistence.conf\fP file stored on the root of its file system. Any +such labeled volume must have such a file, or it will be ignored. .PP El formato de \fBlive\-persistence.conf\fP permite añadir líneas vacias o líneas que comiencen por "#" (usado para los comentarios), ambos serán @@ -28,17 +27,14 @@ ignorados. Un "montaje personalizado" tiene el formato: lo que se traduce como "hacer \fIDIR\fP persistente en la forma descrita en la lista de \fIOPTION\fPs". .PP -Para cada uno de los montajes personalizados \fIDIR\fP debe ser una ruta -absoluta que no puede contener espacios en blanco ni los componentes -especiales . y .. además no puede ser /live (o ninguno de sus -sub\-directorios) ni / (para este último utilizar persistencia -"full\-ov"). Una vez activados todos los cambios (creación, modificación y -borrado de ficheros) en \fIDIR\fP en el sistema de ficheros en vivo, son -guardados de forma persistente en una ruta equivalente a \fIDIR\fP en el medio -persistente, llamado el directorio de origen. La manera de conseguir la -persistencia por defecto es simplemente hacer un montaje enlazado -(bind\-mount N.del T.) del directorio de origen al \fIDIR\fP, aunque esto se -puede cambiar utilizando las opciones \fIOPTION\fPs. +For each custom mount \fIDIR\fP must be an absolute path that cannot contain +white spaces or the special . and .. path components, and cannot be /live +(or any of its sub\-directories). Once activated all changes (file deletion, +creation and modification) to \fIDIR\fP on the live file system are stored +persistently into a path equivalent to \fIDIR\fP on the persistence media, +called the source directory. The default way to achieve persistence is to +simply bind\-mount the corresponding source directory to \fIDIR\fP, but this can +be changed through the use of \fIOPTION\fPs. .PP Todos los montajes personalizados serán montados en orden de tal manera que dos montajes personalizados no se "escondan" uno al otro. Por ejemplo, si diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po index 0e0b6ad..651b5d1 100644 --- a/manpages/po/de/live-boot.7.po +++ b/manpages/po/de/live-boot.7.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot 3.0~a31-1\n" -"POT-Creation-Date: 2012-06-06 18:40+0300\n" +"POT-Creation-Date: 2012-06-06 18:54+0300\n" "PO-Revision-Date: 2012-04-08 22:48+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -572,11 +572,9 @@ msgstr "" 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 " -"files (with the correct file name). Overlays are labeled/named either \"full-" -"ov\", which will be mounted on /, or \"custom-ov\", which can be completely " -"customized (see I(5)). The order these are handled " -"are: full-ov, custom-ov. Overlay image files have extensions which " -"determines their filesystem, e.g. \"custom-ov.ext4\"." +"files (with the correct file name). Overlays are labeled/named \"persistence" +"\" (see I(5)). Overlay image files have extensions " +"which determines their filesystem, e.g. \"persistence.ext4\"." msgstr "" #. type: IP diff --git a/manpages/po/de/live-persistence.conf.5.po b/manpages/po/de/live-persistence.conf.5.po index 790e326..dea30ee 100644 --- a/manpages/po/de/live-persistence.conf.5.po +++ b/manpages/po/de/live-persistence.conf.5.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot 3.0~a31-1\n" -"POT-Creation-Date: 2012-06-06 18:26+0300\n" +"POT-Creation-Date: 2012-06-06 18:55+0300\n" "PO-Revision-Date: 2012-04-08 22:48+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -58,34 +58,34 @@ msgid "OPTIONS" msgstr "" #. type: SH -#: en/live-boot.7:160 en/live-persistence.conf.5:191 +#: en/live-boot.7:156 en/live-persistence.conf.5:191 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: en/live-boot.7:164 en/live-persistence.conf.5:195 +#: en/live-boot.7:160 en/live-persistence.conf.5:195 msgid "I(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:166 en/live-persistence.conf.5:197 +#: en/live-boot.7:162 en/live-persistence.conf.5:197 msgid "I(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:168 en/live-persistence.conf.5:199 +#: en/live-boot.7:164 en/live-persistence.conf.5:199 msgid "I(7)" msgstr "" #. type: SH -#: en/live-boot.7:169 en/live-persistence.conf.5:200 +#: en/live-boot.7:165 en/live-persistence.conf.5:200 #, no-wrap msgid "HOMEPAGE" msgstr "" #. type: Plain text -#: en/live-boot.7:171 en/live-persistence.conf.5:204 +#: en/live-boot.7:167 en/live-persistence.conf.5:204 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at EIE and in the manual at " @@ -93,13 +93,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:172 en/live-persistence.conf.5:205 +#: en/live-boot.7:168 en/live-persistence.conf.5:205 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: en/live-boot.7:174 en/live-persistence.conf.5:210 +#: en/live-boot.7:170 en/live-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 EIE or by " @@ -108,7 +108,7 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:175 en/live-persistence.conf.5:211 +#: en/live-boot.7:171 en/live-persistence.conf.5:211 #, no-wrap msgid "AUTHOR" msgstr "" @@ -124,7 +124,7 @@ msgstr "" #: en/live-persistence.conf.5:13 msgid "" "If live-boot probes a persistence volume with the label (or GPT name, or " -"file name, but from now on we will just say \"label\") \"custom-ov\", that " +"file name, but from now on we will just say \"label\") \"persistence\", that " "volume's persistence is fully customizable through the B file stored on the root of its file system. Any such labeled volume " "must have such a file, or it will be ignored." @@ -155,13 +155,12 @@ msgstr "" msgid "" "For each custom mount I must be an absolute path that cannot contain " "white spaces or the special . and .. path components, and cannot be /live " -"(or any of its sub-directories), or / (for the latter, use \"full-ov\" " -"persistence instead). Once activated all changes (file deletion, creation " -"and modification) to I on the live file system are stored persistently " -"into a path equivalent to I on the persistence media, called the source " -"directory. The default way to achieve persistence is to simply bind-mount " -"the corresponding source directory to I, but this can be changed " -"through the use of I