From: Daniel Baumann Date: Mon, 6 May 2013 12:36:32 +0000 (+0200) Subject: Adding upstream version 4.0~a5. X-Git-Tag: upstream/4.0_a5^0 X-Git-Url: http://git.grml.org/?a=commitdiff_plain;ds=sidebyside;h=71997770be3f27cb50a6b32059862355d955d0e9;p=live-boot-grml.git Adding upstream version 4.0~a5. --- diff --git a/VERSION b/VERSION index ccb6a78..0fdde2b 100644 --- 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 --- 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 +## Copyright (C) 2006-2013 Daniel Baumann ## ## 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 +# Copyright (C) 2006-2013 Daniel Baumann # 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 \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" +msgid "B" 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=I" -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" 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" 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" 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=I,I ... I" 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={I|I}" 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=I,I ... I" 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=I" 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" 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=I,I ... I" 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=I" +msgid "B=I