[SCM] live-config branch, debian, updated. debian/3.0.7-1
Daniel Baumann
daniel at debian.org
Thu Sep 27 10:57:49 UTC 2012
The following commit has been merged in the debian branch:
commit d2bbcd751b7e7ee597f0a231b6965e15446a23a2
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 27 11:54:13 2012 +0200
Moving hooks and preseed inclusion to their final place within the filesystems.
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 1465e69..716aa5a 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -67,11 +67,12 @@ Falls die Datei sich auf dem Live Medium befindet, kann sie mittels
file:///lib/live/image/\fIFILE\fP benutzt werden, falls sie sich im Root
Dateisystem des Live Systems selbst befindet, mittels file:///\fIFILE\fP.
.br
-Alle Preseed Dateien in /lib/live/preseed/ im Root Dateisystem des Live
-Systems können mit der Option 'filesystem' automatisch aktiviert werden.
+Alle Preseed Dateien in /lib/live/config\-preseed/ im Root Dateisystem des
+Live Systems können mit der Option 'filesystem' automatisch aktiviert
+werden.
.br
-Alle Preseed Dateien in /live/preseed/ auf dem Live Medium können mit der
-Option 'medium' automatisch aktiviert werden.
+Alle Preseed Dateien in /live/config\-preseed/ auf dem Live Medium können mit
+der Option 'medium' automatisch aktiviert werden.
.br
Werden verschiedene Mechanismen kombiniert, so werden die Dateisystem
Preseed Dateien zuerst ausgeführt, dann die des Mediums und zuletzt die sich
@@ -140,11 +141,11 @@ Falls die Datei sich auf dem Live Medium befindet, kann sie mittels
file:///lib/live/image/\fIFILE\fP benutzt werden, falls sie sich im Root
Dateisystem des Live Systems selbst befindet, mittels file:///\fIFILE\fP.
.br
-Alle Dateien in /lib/live/hooks/ im Root Dateisystem des Live Systems können
-mit der Option 'filesystem' automatisch aktiviert werden.
+Alle Dateien in /lib/live/config\-hooks/ im Root Dateisystem des Live Systems
+können mit der Option 'filesystem' automatisch aktiviert werden.
.br
-Alle Dateien in /live/hooks/ auf dem Live Medium können mit der Option
-\&'medium' automatisch aktiviert werden.
+Alle Dateien in /live/config\-hooks/ auf dem Live Medium können mit der
+Option 'medium' automatisch aktiviert werden.
.br
Werden verschiedene Mechanismen kombiniert, so werden die Dateisystem Hooks
zuerst ausgeführt, dann die des Mediums und zuletzt die sich im Netzwerk
@@ -375,10 +376,10 @@ einem HTTP/FTP Server auszuführen.
.IP \fB/var/lib/live/config/\fP 4
.IP \fB/var/log/live/config.log\fP 4
.PP
-.IP \fB/live/hooks/*\fP 4
-.IP \fBlive/hooks/*\fP 4
-.IP \fB/live/preseed/*\fP 4
-.IP "\fBlive/preseed/* \fP" 4
+.IP \fB/live/config\-hooks/*\fP 4
+.IP \fBlive/config\-hooks/*\fP 4
+.IP \fB/live/config\-preseed/*\fP 4
+.IP "\fBlive/config\-preseed/* \fP" 4
.SH "SIEHE AUCH"
\fIlive\-boot\fP(7)
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 0d5b6f6..59fc9cc 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -39,9 +39,9 @@ Allows to fetch and apply one or more debconf preseed files to be applied to the
.br
If the file is placed on the live medium, it can be fetched with file:///lib/live/image/\fIFILE\fR, or with file:///\fIFILE\fR if it is in the root filesystem of the live system itself.
.br
-All preseed files in /lib/live/preseed/ in the root filesystem of the live system can be automatically be enabled with the keyword 'filesystem'.
+All preseed files in /lib/live/config\-preseed/ in the root filesystem of the live system can be automatically be enabled with the keyword 'filesystem'.
.br
-All preseed files in /live/preseed/ of the live medium can be automatically be enabled with the keyword 'medium'.
+All preseed files in /live/config\-preseed/ of the live medium can be automatically be enabled with the keyword 'medium'.
.br
If several mechanisms are combined, then filesystem preseed files are applied first, then medium preseed files, and last the network preseed files.
.IP "\fBlive\-config.hostname\fR=\fIHOSTNAME\fR | \fBhostname\fR=\fIHOSTNAME\fR" 4
@@ -79,9 +79,9 @@ Allows to fetch and execute one or more arbitrary files. Note that the URLs must
.br
If the file is placed on the live medium, it can be fetched with file:///lib/live/image/\fIFILE\fR, or with file:///\fIFILE\fR if it is in the root filesystem of the live system itself.
.br
-All hooks in /lib/live/hooks/ in the root filesystem of the live system can be automatically be enabled with the keyword 'filesystem'.
+All hooks in /lib/live/config\-hooks/ in the root filesystem of the live system can be automatically be enabled with the keyword 'filesystem'.
.br
-All hooks in /live/hooks/ of the live medium can be automatically be enabled with the keyword 'medium'.
+All hooks in /live/config\-hooks/ of the live medium can be automatically be enabled with the keyword 'medium'.
.br
If several mechanisms are combined, then filesystem hooks are executed first, then medium hooks, and last the network hooks.
@@ -250,10 +250,10 @@ allows to run arbitrary commands from a script placed on the live media or an ht
.IP "\fB/var/lib/live/config/\fR" 4
.IP "\fB/var/log/live/config.log\fR" 4
.PP
-.IP "\fB/live/hooks/*\fR" 4
-.IP "\fBlive/hooks/*\fR" 4
-.IP "\fB/live/preseed/*\fR" 4
-.IP "\fBlive/preseed/* \fR" 4
+.IP "\fB/live/config\-hooks/*\fR" 4
+.IP "\fBlive/config\-hooks/*\fR" 4
+.IP "\fB/live/config\-preseed/*\fR" 4
+.IP "\fBlive/config\-preseed/* \fR" 4
.SH SEE ALSO
\fIlive\-boot\fR(7)
diff --git a/manpages/es/live-config.es.7 b/manpages/es/live-config.es.7
index fe938b5..8864275 100644
--- a/manpages/es/live-config.es.7
+++ b/manpages/es/live-config.es.7
@@ -65,12 +65,12 @@ Si el archivo está en el medio en vivo, se puede obtener con
file:///lib/live/image/\fIFILE\fP, o con file:///\fIFILE\fP si se encuentra en el
directorio raíz del sistema en vivo.
.br
-Todos los ficheros de preconfiguración en /lib/live/preseed/ en el sistema
-de ficheros raíz del sistema en vivo pueden activarse automáticamente con la
-palabra clave «filesystem».
+Todos los ficheros de preconfiguración en /lib/live/config\-preseed/ en el
+sistema de ficheros raíz del sistema en vivo pueden activarse
+automáticamente con la palabra clave «filesystem».
.br
-Todos los ficheros en /live/preseed/ del medio en vivo pueden activarse
-automáticamente con la palabra clave «medium».
+Todos los ficheros en /live/config\-preseed/ del medio en vivo pueden
+activarse automáticamente con la palabra clave «medium».
.br
Si se combinan varios mecanismos, los ficheros de preconfiguración del
sistema de ficheros se aplican primero, después los ficheros de
@@ -138,11 +138,11 @@ Si el archivo está en el medio en vivo, se puede obtener con
file:///lib/live/image/\fIFILE\fP, o con file:///\fIFILE\fP si se encuentra en el
directorio raíz del sistema en vivo.
.br
-Todos los scripts gancho de /lib/live/hooks/ del directorio raíz del sistema
-en vivo pueden activarse con la palabra clave «filesystem».
+Todos los scripts gancho de /lib/live/config\-hooks/ del directorio raíz del
+sistema en vivo pueden activarse con la palabra clave «filesystem».
.br
-Todos los scripts gancho de /live/hooks/ del medio en vivo pueden activarse
-con la palabra clave «medium».
+Todos los scripts gancho de /live/config\-hooks/ del medio en vivo pueden
+activarse con la palabra clave «medium».
.br
Si se combinan varios mecanismos, los scripts gancho del sistema de archivos
se ejecutan primero, después los del medio, y en último lugar los de red.
@@ -364,10 +364,10 @@ el medio en vivo o en un servidor http/ftp.
.IP \fB/var/lib/live/config/\fP 4
.IP \fB/var/log/live/config.log\fP 4
.PP
-.IP \fB/live/hooks/*\fP 4
-.IP \fBlive/hooks/*\fP 4
-.IP \fB/live/preseed/*\fP 4
-.IP "\fBlive/preseed/* \fP" 4
+.IP \fB/live/config\-hooks/*\fP 4
+.IP \fBlive/config\-hooks/*\fP 4
+.IP \fB/live/config\-preseed/*\fP 4
+.IP "\fBlive/config\-preseed/* \fP" 4
.SH "VER ADEMÁS"
\fIlive\-boot\fP(7)
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index aaddfa1..4492773 100644
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -67,12 +67,12 @@ Si le fichier est placé dans le média live, il peut être utilisé avec
file:///lib/live/image/\fIFILE\fP, ou bien avec file:///\fIFILE\fP s'il est placé
à la racine du système de fichiers du système live.
.br
-Tous les fichiers de préconfiguration dans /lib/live/preseed/ dans le
+Tous les fichiers de préconfiguration dans /lib/live/config\-preseed/ dans le
système de fichiers racine du système live peuvent être automatiquement
activés avec le mot clé 'filesystem'.
.br
-Tous les fichiers de préconfiguration dans /live/preseed/ du média live
-peuvent être automatiquement activés avec le mot clé 'medium'
+Tous les fichiers de préconfiguration dans /live/config\-preseed/ du média
+live peuvent être automatiquement activés avec le mot clé 'medium'
.br
Si plusieurs mécanismes sont combinés, les fichiers de préconfiguration du
système de fichiers sont appliqués en premier, alors les fichiers de
@@ -144,11 +144,12 @@ Si le fichier est placé dans le média live, il peut être utilisé avec
file:///lib/live/image/\fIFILE\fP, ou bien avec file:///\fIFILE\fP s'il est placé
à la racine du système de fichiers du système live.
.br
-Tous les hooks, placés dans /lib/live/hooks/ à la racine du système de
-fichiers, peuvent être automatiquement activés avec le mot clé 'filesystem'.
+Tous les hooks, placés dans /lib/live/config\-hooks/ à la racine du système
+de fichiers, peuvent être automatiquement activés avec le mot clé
+\&'filesystem'.
.br
-Tous les hooks dans /live/hooks/ du média live peuvent être automatiquement
-activés avec le mot clé 'medium'.
+Tous les hooks dans /live/config\-hooks/ du média live peuvent être
+automatiquement activés avec le mot clé 'medium'.
.br
Si plusieurs mécanismes sont combinés, alors les hooks du système de
fichiers sont exécutés prioritairement, suivis des hooks du media, et enfin
@@ -377,10 +378,10 @@ live, ou sur un serveur http/ftp.
.IP \fB/var/lib/live/config/\fP 4
.IP \fB/var/log/live/config.log\fP 4
.PP
-.IP \fB/live/hooks/*\fP 4
-.IP \fBlive/hooks/*\fP 4
-.IP \fB/live/preseed/*\fP 4
-.IP "\fBlive/preseed/* \fP" 4
+.IP \fB/live/config\-hooks/*\fP 4
+.IP \fBlive/config\-hooks/*\fP 4
+.IP \fB/live/config\-preseed/*\fP 4
+.IP "\fBlive/config\-preseed/* \fP" 4
.SH "VOIR AUSSI"
\fIlive\-boot\fP(7)
diff --git a/manpages/it/live-config.it.7 b/manpages/it/live-config.it.7
index c6e1b8c..6934bfe 100644
--- a/manpages/it/live-config.it.7
+++ b/manpages/it/live-config.it.7
@@ -66,11 +66,11 @@ Se il file è posizionato sul supporto live, questo può essere prelevato con
file:///lib/live/image/\fIFILE\fP, o con file:///\fIFILE\fP se è nella radice del
filesystem del sistema live stesso.
.br
-Tutti i file di preconfigurazione in /lib/live/preseed/ nella radice del
-sistema live possono essere abilitati automaticamente con la parola chiave
-"filesystem".
+Tutti i file di preconfigurazione in /lib/live/config\-preseed/ nella radice
+del sistema live possono essere abilitati automaticamente con la parola
+chiave "filesystem".
.br
-Tutti i file di preconfigurazione in /live/preseed/ sul supporto live
+Tutti i file di preconfigurazione in /live/config\-preseed/ sul supporto live
possono essere abilitati automaticamente con la parola chiave "medium".
.br
Se vengono congiunti diversi meccanismi i file di preconfigurazione di tipo
@@ -139,11 +139,11 @@ Se il file è posizionato sul supporto live, questo può essere prelevato con
file:///lib/live/image/\fIFILE\fP, o con file:///\fIFILE\fP se è nella radice del
filesystem del sistema live stesso.
.br
-Tutti gli hook nella directory /lib/live/hooks/ del sistema live possono
-essere abilitati automaticamente con la parola chiave "filesystem".
+Tutti gli hook nella directory /lib/live/config\-hooks/ del sistema live
+possono essere abilitati automaticamente con la parola chiave "filesystem".
.br
-Tutti gli hook nella directory /live/hooks/ del sistema live possono essere
-abilitati automaticamente con la parola chiave "medium".
+Tutti gli hook nella directory /live/config\-hooks/ del sistema live possono
+essere abilitati automaticamente con la parola chiave "medium".
.br
Se vengono congiunti svariati meccanismi, gli hook di tipo filesystem
vengono applicati per primi, seguiti dalla tipologia medium e quindi da
@@ -366,10 +366,10 @@ live o su un server http/ftp.
.IP \fB/var/lib/live/config/\fP 4
.IP \fB/var/log/live/config.log\fP 4
.PP
-.IP \fB/live/hooks/*\fP 4
-.IP \fBlive/hooks/*\fP 4
-.IP \fB/live/preseed/*\fP 4
-.IP "\fBlive/preseed/* \fP" 4
+.IP \fB/live/config\-hooks/*\fP 4
+.IP \fBlive/config\-hooks/*\fP 4
+.IP \fB/live/config\-preseed/*\fP 4
+.IP "\fBlive/config\-preseed/* \fP" 4
.SH "VEDERE ANCHE"
\fIlive\-boot\fP(7)
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index b654662..ff5648b 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 3.0.6-1\n"
-"POT-Creation-Date: 2012-09-27 11:41+0300\n"
+"POT-Creation-Date: 2012-09-27 11:46+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -222,20 +222,20 @@ msgstr ""
#. type: Plain text
#: en/live-config.7:43
msgid ""
-"All preseed files in /lib/live/preseed/ in the root filesystem of the live "
-"system can be automatically be enabled with the keyword 'filesystem'."
+"All preseed files in /lib/live/config-preseed/ in the root filesystem of the "
+"live system can be automatically be enabled with the keyword 'filesystem'."
msgstr ""
-"Alle Preseed Dateien in /lib/live/preseed/ im Root Dateisystem des Live "
-"Systems können mit der Option 'filesystem' automatisch aktiviert werden."
+"Alle Preseed Dateien in /lib/live/config-preseed/ im Root Dateisystem des "
+"Live Systems können mit der Option 'filesystem' automatisch aktiviert werden."
#. type: Plain text
#: en/live-config.7:45
msgid ""
-"All preseed files in /live/preseed/ of the live medium can be automatically "
-"be enabled with the keyword 'medium'."
+"All preseed files in /live/config-preseed/ of the live medium can be "
+"automatically be enabled with the keyword 'medium'."
msgstr ""
-"Alle Preseed Dateien in /live/preseed/ auf dem Live Medium können mit der "
-"Option 'medium' automatisch aktiviert werden."
+"Alle Preseed Dateien in /live/config-preseed/ auf dem Live Medium können mit "
+"der Option 'medium' automatisch aktiviert werden."
#. type: Plain text
#: en/live-config.7:47
@@ -497,20 +497,20 @@ msgstr ""
#. type: Plain text
#: en/live-config.7:83
msgid ""
-"All hooks in /lib/live/hooks/ in the root filesystem of the live system can "
-"be automatically be enabled with the keyword 'filesystem'."
+"All hooks in /lib/live/config-hooks/ in the root filesystem of the live "
+"system can be automatically be enabled with the keyword 'filesystem'."
msgstr ""
-"Alle Dateien in /lib/live/hooks/ im Root Dateisystem des Live Systems können "
-"mit der Option 'filesystem' automatisch aktiviert werden."
+"Alle Dateien in /lib/live/config-hooks/ im Root Dateisystem des Live Systems "
+"können mit der Option 'filesystem' automatisch aktiviert werden."
#. type: Plain text
#: en/live-config.7:85
msgid ""
-"All hooks in /live/hooks/ of the live medium can be automatically be enabled "
-"with the keyword 'medium'."
+"All hooks in /live/config-hooks/ of the live medium can be automatically be "
+"enabled with the keyword 'medium'."
msgstr ""
-"Alle Dateien in /live/hooks/ auf dem Live Medium können mit der Option "
-"'medium' automatisch aktiviert werden."
+"Alle Dateien in /live/config-hooks/ auf dem Live Medium können mit der "
+"Option 'medium' automatisch aktiviert werden."
#. type: Plain text
#: en/live-config.7:87
@@ -1500,26 +1500,26 @@ msgstr "B</var/log/live/config.log>"
#. type: IP
#: en/live-config.7:253
#, no-wrap
-msgid "B</live/hooks/*>"
-msgstr "B</live/hooks/*>"
+msgid "B</live/config-hooks/*>"
+msgstr "B</live/config-hooks/*>"
#. type: IP
#: en/live-config.7:254
#, no-wrap
-msgid "B<live/hooks/*>"
-msgstr "B<live/hooks/*>"
+msgid "B<live/config-hooks/*>"
+msgstr "B<live/config-hooks/*>"
#. type: IP
#: en/live-config.7:255
#, no-wrap
-msgid "B</live/preseed/*>"
-msgstr "B</live/preseed/*>"
+msgid "B</live/config-preseed/*>"
+msgstr "B</live/config-preseed/*>"
#. type: IP
#: en/live-config.7:256
#, no-wrap
-msgid "B<live/preseed/* >"
-msgstr "B<live/preseed/* >"
+msgid "B<live/config-preseed/* >"
+msgstr "B<live/config-preseed/* >"
#. type: SH
#: en/live-config.7:258
diff --git a/manpages/po/es/live-config.7.po b/manpages/po/es/live-config.7.po
index c47c163..2511aed 100644
--- a/manpages/po/es/live-config.7.po
+++ b/manpages/po/es/live-config.7.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 3.0.6-1\n"
-"POT-Creation-Date: 2012-09-27 11:41+0300\n"
+"POT-Creation-Date: 2012-09-27 11:46+0300\n"
"PO-Revision-Date: 2012-07-28 22:11+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -221,21 +221,21 @@ msgstr ""
#. type: Plain text
#: en/live-config.7:43
msgid ""
-"All preseed files in /lib/live/preseed/ in the root filesystem of the live "
-"system can be automatically be enabled with the keyword 'filesystem'."
+"All preseed files in /lib/live/config-preseed/ in the root filesystem of the "
+"live system can be automatically be enabled with the keyword 'filesystem'."
msgstr ""
-"Todos los ficheros de preconfiguración en /lib/live/preseed/ en el sistema "
-"de ficheros raíz del sistema en vivo pueden activarse automáticamente con la "
-"palabra clave «filesystem»."
+"Todos los ficheros de preconfiguración en /lib/live/config-preseed/ en el "
+"sistema de ficheros raíz del sistema en vivo pueden activarse "
+"automáticamente con la palabra clave «filesystem»."
#. type: Plain text
#: en/live-config.7:45
msgid ""
-"All preseed files in /live/preseed/ of the live medium can be automatically "
-"be enabled with the keyword 'medium'."
+"All preseed files in /live/config-preseed/ of the live medium can be "
+"automatically be enabled with the keyword 'medium'."
msgstr ""
-"Todos los ficheros en /live/preseed/ del medio en vivo pueden activarse "
-"automáticamente con la palabra clave «medium»."
+"Todos los ficheros en /live/config-preseed/ del medio en vivo pueden "
+"activarse automáticamente con la palabra clave «medium»."
#. type: Plain text
#: en/live-config.7:47
@@ -492,20 +492,20 @@ msgstr ""
#. type: Plain text
#: en/live-config.7:83
msgid ""
-"All hooks in /lib/live/hooks/ in the root filesystem of the live system can "
-"be automatically be enabled with the keyword 'filesystem'."
+"All hooks in /lib/live/config-hooks/ in the root filesystem of the live "
+"system can be automatically be enabled with the keyword 'filesystem'."
msgstr ""
-"Todos los scripts gancho de /lib/live/hooks/ del directorio raíz del sistema "
-"en vivo pueden activarse con la palabra clave «filesystem»."
+"Todos los scripts gancho de /lib/live/config-hooks/ del directorio raíz del "
+"sistema en vivo pueden activarse con la palabra clave «filesystem»."
#. type: Plain text
#: en/live-config.7:85
msgid ""
-"All hooks in /live/hooks/ of the live medium can be automatically be enabled "
-"with the keyword 'medium'."
+"All hooks in /live/config-hooks/ of the live medium can be automatically be "
+"enabled with the keyword 'medium'."
msgstr ""
-"Todos los scripts gancho de /live/hooks/ del medio en vivo pueden activarse "
-"con la palabra clave «medium»."
+"Todos los scripts gancho de /live/config-hooks/ del medio en vivo pueden "
+"activarse con la palabra clave «medium»."
#. type: Plain text
#: en/live-config.7:87
@@ -1487,26 +1487,26 @@ msgstr "B</var/log/live/config.log>"
#. type: IP
#: en/live-config.7:253
#, no-wrap
-msgid "B</live/hooks/*>"
-msgstr "B</live/hooks/*>"
+msgid "B</live/config-hooks/*>"
+msgstr "B</live/config-hooks/*>"
#. type: IP
#: en/live-config.7:254
#, no-wrap
-msgid "B<live/hooks/*>"
-msgstr "B<live/hooks/*>"
+msgid "B<live/config-hooks/*>"
+msgstr "B<live/config-hooks/*>"
#. type: IP
#: en/live-config.7:255
#, no-wrap
-msgid "B</live/preseed/*>"
-msgstr "B</live/preseed/*>"
+msgid "B</live/config-preseed/*>"
+msgstr "B</live/config-preseed/*>"
#. type: IP
#: en/live-config.7:256
#, no-wrap
-msgid "B<live/preseed/* >"
-msgstr "B<live/preseed/* >"
+msgid "B<live/config-preseed/* >"
+msgstr "B<live/config-preseed/* >"
#. type: SH
#: en/live-config.7:258
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index bf2a454..5dd2dd3 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 3.0.6-1\n"
-"POT-Creation-Date: 2012-09-27 11:41+0300\n"
+"POT-Creation-Date: 2012-09-27 11:46+0300\n"
"PO-Revision-Date: 2012-07-28 22:13+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -223,21 +223,21 @@ msgstr ""
#. type: Plain text
#: en/live-config.7:43
msgid ""
-"All preseed files in /lib/live/preseed/ in the root filesystem of the live "
-"system can be automatically be enabled with the keyword 'filesystem'."
+"All preseed files in /lib/live/config-preseed/ in the root filesystem of the "
+"live system can be automatically be enabled with the keyword 'filesystem'."
msgstr ""
-"Tous les fichiers de préconfiguration dans /lib/live/preseed/ dans le "
+"Tous les fichiers de préconfiguration dans /lib/live/config-preseed/ dans le "
"système de fichiers racine du système live peuvent être automatiquement "
"activés avec le mot clé 'filesystem'."
#. type: Plain text
#: en/live-config.7:45
msgid ""
-"All preseed files in /live/preseed/ of the live medium can be automatically "
-"be enabled with the keyword 'medium'."
+"All preseed files in /live/config-preseed/ of the live medium can be "
+"automatically be enabled with the keyword 'medium'."
msgstr ""
-"Tous les fichiers de préconfiguration dans /live/preseed/ du média live "
-"peuvent être automatiquement activés avec le mot clé 'medium'"
+"Tous les fichiers de préconfiguration dans /live/config-preseed/ du média "
+"live peuvent être automatiquement activés avec le mot clé 'medium'"
#. type: Plain text
#: en/live-config.7:47
@@ -501,20 +501,21 @@ msgstr ""
#. type: Plain text
#: en/live-config.7:83
msgid ""
-"All hooks in /lib/live/hooks/ in the root filesystem of the live system can "
-"be automatically be enabled with the keyword 'filesystem'."
+"All hooks in /lib/live/config-hooks/ in the root filesystem of the live "
+"system can be automatically be enabled with the keyword 'filesystem'."
msgstr ""
-"Tous les hooks, placés dans /lib/live/hooks/ à la racine du système de "
-"fichiers, peuvent être automatiquement activés avec le mot clé 'filesystem'."
+"Tous les hooks, placés dans /lib/live/config-hooks/ à la racine du système "
+"de fichiers, peuvent être automatiquement activés avec le mot clé "
+"'filesystem'."
#. type: Plain text
#: en/live-config.7:85
msgid ""
-"All hooks in /live/hooks/ of the live medium can be automatically be enabled "
-"with the keyword 'medium'."
+"All hooks in /live/config-hooks/ of the live medium can be automatically be "
+"enabled with the keyword 'medium'."
msgstr ""
-"Tous les hooks dans /live/hooks/ du média live peuvent être automatiquement "
-"activés avec le mot clé 'medium'."
+"Tous les hooks dans /live/config-hooks/ du média live peuvent être "
+"automatiquement activés avec le mot clé 'medium'."
#. type: Plain text
#: en/live-config.7:87
@@ -1504,26 +1505,26 @@ msgstr "B</var/log/live/config.log>"
#. type: IP
#: en/live-config.7:253
#, no-wrap
-msgid "B</live/hooks/*>"
-msgstr "B</live/hooks/*>"
+msgid "B</live/config-hooks/*>"
+msgstr "B</live/config-hooks/*>"
#. type: IP
#: en/live-config.7:254
#, no-wrap
-msgid "B<live/hooks/*>"
-msgstr "B<live/hooks/*>"
+msgid "B<live/config-hooks/*>"
+msgstr "B<live/config-hooks/*>"
#. type: IP
#: en/live-config.7:255
#, no-wrap
-msgid "B</live/preseed/*>"
-msgstr "B</live/preseed/*>"
+msgid "B</live/config-preseed/*>"
+msgstr "B</live/config-preseed/*>"
#. type: IP
#: en/live-config.7:256
#, no-wrap
-msgid "B<live/preseed/* >"
-msgstr "B<live/preseed/* >"
+msgid "B<live/config-preseed/* >"
+msgstr "B<live/config-preseed/* >"
#. type: SH
#: en/live-config.7:258
diff --git a/manpages/po/it/live-config.7.po b/manpages/po/it/live-config.7.po
index 7d3f35c..bd1d6d6 100644
--- a/manpages/po/it/live-config.7.po
+++ b/manpages/po/it/live-config.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 3.0.6-1\n"
-"POT-Creation-Date: 2012-09-27 11:41+0300\n"
+"POT-Creation-Date: 2012-09-27 11:46+0300\n"
"PO-Revision-Date: 2012-08-03 17:13+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: none\n"
@@ -220,20 +220,20 @@ msgstr ""
#. type: Plain text
#: en/live-config.7:43
msgid ""
-"All preseed files in /lib/live/preseed/ in the root filesystem of the live "
-"system can be automatically be enabled with the keyword 'filesystem'."
+"All preseed files in /lib/live/config-preseed/ in the root filesystem of the "
+"live system can be automatically be enabled with the keyword 'filesystem'."
msgstr ""
-"Tutti i file di preconfigurazione in /lib/live/preseed/ nella radice del "
-"sistema live possono essere abilitati automaticamente con la parola chiave "
-"\"filesystem\"."
+"Tutti i file di preconfigurazione in /lib/live/config-preseed/ nella radice "
+"del sistema live possono essere abilitati automaticamente con la parola "
+"chiave \"filesystem\"."
#. type: Plain text
#: en/live-config.7:45
msgid ""
-"All preseed files in /live/preseed/ of the live medium can be automatically "
-"be enabled with the keyword 'medium'."
+"All preseed files in /live/config-preseed/ of the live medium can be "
+"automatically be enabled with the keyword 'medium'."
msgstr ""
-"Tutti i file di preconfigurazione in /live/preseed/ sul supporto live "
+"Tutti i file di preconfigurazione in /live/config-preseed/ sul supporto live "
"possono essere abilitati automaticamente con la parola chiave \"medium\"."
#. type: Plain text
@@ -495,20 +495,20 @@ msgstr ""
#. type: Plain text
#: en/live-config.7:83
msgid ""
-"All hooks in /lib/live/hooks/ in the root filesystem of the live system can "
-"be automatically be enabled with the keyword 'filesystem'."
+"All hooks in /lib/live/config-hooks/ in the root filesystem of the live "
+"system can be automatically be enabled with the keyword 'filesystem'."
msgstr ""
-"Tutti gli hook nella directory /lib/live/hooks/ del sistema live possono "
-"essere abilitati automaticamente con la parola chiave \"filesystem\"."
+"Tutti gli hook nella directory /lib/live/config-hooks/ del sistema live "
+"possono essere abilitati automaticamente con la parola chiave \"filesystem\"."
#. type: Plain text
#: en/live-config.7:85
msgid ""
-"All hooks in /live/hooks/ of the live medium can be automatically be enabled "
-"with the keyword 'medium'."
+"All hooks in /live/config-hooks/ of the live medium can be automatically be "
+"enabled with the keyword 'medium'."
msgstr ""
-"Tutti gli hook nella directory /live/hooks/ del sistema live possono essere "
-"abilitati automaticamente con la parola chiave \"medium\"."
+"Tutti gli hook nella directory /live/config-hooks/ del sistema live possono "
+"essere abilitati automaticamente con la parola chiave \"medium\"."
#. type: Plain text
#: en/live-config.7:87
@@ -1491,26 +1491,26 @@ msgstr "B</var/log/live/config.log>"
#. type: IP
#: en/live-config.7:253
#, no-wrap
-msgid "B</live/hooks/*>"
-msgstr "B</live/hooks/*>"
+msgid "B</live/config-hooks/*>"
+msgstr "B</live/config-hooks/*>"
#. type: IP
#: en/live-config.7:254
#, no-wrap
-msgid "B<live/hooks/*>"
-msgstr "B<live/hooks/*>"
+msgid "B<live/config-hooks/*>"
+msgstr "B<live/config-hooks/*>"
#. type: IP
#: en/live-config.7:255
#, no-wrap
-msgid "B</live/preseed/*>"
-msgstr "B</live/preseed/*>"
+msgid "B</live/config-preseed/*>"
+msgstr "B</live/config-preseed/*>"
#. type: IP
#: en/live-config.7:256
#, no-wrap
-msgid "B<live/preseed/* >"
-msgstr "B<live/preseed/* >"
+msgid "B<live/config-preseed/* >"
+msgstr "B<live/config-preseed/* >"
#. type: SH
#: en/live-config.7:258
diff --git a/manpages/po/pt_BR/live-config.7.po b/manpages/po/pt_BR/live-config.7.po
index dc63159..2e13078 100644
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 3.0.6-1\n"
-"POT-Creation-Date: 2012-09-27 11:41+0300\n"
+"POT-Creation-Date: 2012-09-27 11:46+0300\n"
"PO-Revision-Date: 2012-07-28 11:38-0400\n"
"Last-Translator: Tiago Bortoletto Vaz <tiago at debian.org>\n"
"Language-Team: none\n"
@@ -221,21 +221,21 @@ msgstr ""
#. type: Plain text
#: en/live-config.7:43
msgid ""
-"All preseed files in /lib/live/preseed/ in the root filesystem of the live "
-"system can be automatically be enabled with the keyword 'filesystem'."
+"All preseed files in /lib/live/config-preseed/ in the root filesystem of the "
+"live system can be automatically be enabled with the keyword 'filesystem'."
msgstr ""
-"Todos os arquivos de preseeds em /lib/live/preseed/ no sistema de arquivos "
-"raiz do sistema live podem ser automaticamente ativados com a palavra-chave "
-"'filesystem'."
+"Todos os arquivos de preseeds em /lib/live/config-preseed/ no sistema de "
+"arquivos raiz do sistema live podem ser automaticamente ativados com a "
+"palavra-chave 'filesystem'."
#. type: Plain text
#: en/live-config.7:45
msgid ""
-"All preseed files in /live/preseed/ of the live medium can be automatically "
-"be enabled with the keyword 'medium'."
+"All preseed files in /live/config-preseed/ of the live medium can be "
+"automatically be enabled with the keyword 'medium'."
msgstr ""
-"Todos os arquivos de preseeds em /live/preseed/ da mídia live podem ser "
-"automaticamente ativados com a palavra-chave 'medium'."
+"Todos os arquivos de preseeds em /live/config-preseed/ da mídia live podem "
+"ser automaticamente ativados com a palavra-chave 'medium'."
#. type: Plain text
#: en/live-config.7:47
@@ -490,20 +490,20 @@ msgstr ""
#. type: Plain text
#: en/live-config.7:83
msgid ""
-"All hooks in /lib/live/hooks/ in the root filesystem of the live system can "
-"be automatically be enabled with the keyword 'filesystem'."
+"All hooks in /lib/live/config-hooks/ in the root filesystem of the live "
+"system can be automatically be enabled with the keyword 'filesystem'."
msgstr ""
-"Todos os hooks no diretório /lib/live/hooks do sistema de arquivos raiz do "
-"sistema live podem ser automaticamente habilitados com a palavra-chave "
-"'filesystem'."
+"Todos os hooks no diretório /lib/live/config-hooks do sistema de arquivos "
+"raiz do sistema live podem ser automaticamente habilitados com a palavra-"
+"chave 'filesystem'."
#. type: Plain text
#: en/live-config.7:85
msgid ""
-"All hooks in /live/hooks/ of the live medium can be automatically be enabled "
-"with the keyword 'medium'."
+"All hooks in /live/config-hooks/ of the live medium can be automatically be "
+"enabled with the keyword 'medium'."
msgstr ""
-"Todos os hooks no diretório /live/hooks/ da mídia live podem ser "
+"Todos os hooks no diretório /live/config-hooks/ da mídia live podem ser "
"automaticamente habilitados com a palavra-chave 'medium'."
#. type: Plain text
@@ -1494,26 +1494,26 @@ msgstr "B</var/log/live/config.log>"
#. type: IP
#: en/live-config.7:253
#, no-wrap
-msgid "B</live/hooks/*>"
-msgstr "B</live/hooks/*>"
+msgid "B</live/config-hooks/*>"
+msgstr "B</live/config-hooks/*>"
#. type: IP
#: en/live-config.7:254
#, no-wrap
-msgid "B<live/hooks/*>"
-msgstr "B<live/hooks/*>"
+msgid "B<live/config-hooks/*>"
+msgstr "B<live/config-hooks/*>"
#. type: IP
#: en/live-config.7:255
#, no-wrap
-msgid "B</live/preseed/*>"
-msgstr "B</live/preseed/*>"
+msgid "B</live/config-preseed/*>"
+msgstr "B</live/config-preseed/*>"
#. type: IP
#: en/live-config.7:256
#, no-wrap
-msgid "B<live/preseed/* >"
-msgstr "B<live/preseed/* >"
+msgid "B<live/config-preseed/* >"
+msgstr "B<live/config-preseed/* >"
#. type: SH
#: en/live-config.7:258
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index d6f0ca6..b49f42a 100644
--- a/manpages/pot/live-config.7.pot
+++ b/manpages/pot/live-config.7.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config VERSION\n"
-"POT-Creation-Date: 2012-09-27 11:41+0300\n"
+"POT-Creation-Date: 2012-09-27 11:46+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -190,15 +190,15 @@ msgstr ""
#. type: Plain text
#: en/live-config.7:43
msgid ""
-"All preseed files in /lib/live/preseed/ in the root filesystem of the live "
-"system can be automatically be enabled with the keyword 'filesystem'."
+"All preseed files in /lib/live/config-preseed/ in the root filesystem of the "
+"live system can be automatically be enabled with the keyword 'filesystem'."
msgstr ""
#. type: Plain text
#: en/live-config.7:45
msgid ""
-"All preseed files in /live/preseed/ of the live medium can be automatically "
-"be enabled with the keyword 'medium'."
+"All preseed files in /live/config-preseed/ of the live medium can be "
+"automatically be enabled with the keyword 'medium'."
msgstr ""
#. type: Plain text
@@ -417,15 +417,15 @@ msgstr ""
#. type: Plain text
#: en/live-config.7:83
msgid ""
-"All hooks in /lib/live/hooks/ in the root filesystem of the live system can "
-"be automatically be enabled with the keyword 'filesystem'."
+"All hooks in /lib/live/config-hooks/ in the root filesystem of the live "
+"system can be automatically be enabled with the keyword 'filesystem'."
msgstr ""
#. type: Plain text
#: en/live-config.7:85
msgid ""
-"All hooks in /live/hooks/ of the live medium can be automatically be enabled "
-"with the keyword 'medium'."
+"All hooks in /live/config-hooks/ of the live medium can be automatically be "
+"enabled with the keyword 'medium'."
msgstr ""
#. type: Plain text
@@ -1323,25 +1323,25 @@ msgstr ""
#. type: IP
#: en/live-config.7:253
#, no-wrap
-msgid "B</live/hooks/*>"
+msgid "B</live/config-hooks/*>"
msgstr ""
#. type: IP
#: en/live-config.7:254
#, no-wrap
-msgid "B<live/hooks/*>"
+msgid "B<live/config-hooks/*>"
msgstr ""
#. type: IP
#: en/live-config.7:255
#, no-wrap
-msgid "B</live/preseed/*>"
+msgid "B</live/config-preseed/*>"
msgstr ""
#. type: IP
#: en/live-config.7:256
#, no-wrap
-msgid "B<live/preseed/* >"
+msgid "B<live/config-preseed/* >"
msgstr ""
#. type: SH
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index f39e4e4..f737f26 100644
--- a/manpages/pt_BR/live-config.pt_BR.7
+++ b/manpages/pt_BR/live-config.pt_BR.7
@@ -65,12 +65,12 @@ Se o arquivo estiver na mídia live, ele pode ser obtido através de
file:///lib/live/image/\fIFILE\fP ou file:///\fIFILE\fP se estiver no sistema raiz
do próprio sistema live.
.br
-Todos os arquivos de preseeds em /lib/live/preseed/ no sistema de arquivos
-raiz do sistema live podem ser automaticamente ativados com a palavra\-chave
-\&'filesystem'.
+Todos os arquivos de preseeds em /lib/live/config\-preseed/ no sistema de
+arquivos raiz do sistema live podem ser automaticamente ativados com a
+palavra\-chave 'filesystem'.
.br
-Todos os arquivos de preseeds em /live/preseed/ da mídia live podem ser
-automaticamente ativados com a palavra\-chave 'medium'.
+Todos os arquivos de preseeds em /live/config\-preseed/ da mídia live podem
+ser automaticamente ativados com a palavra\-chave 'medium'.
.br
Se diversos mecanismos são combinados, os arquivos de preseed referentes ao
sistema de arquivos (filesystem) são aplicados primeiramente, seguidos pelos
@@ -136,11 +136,11 @@ Se o arquivo estiver na mídia live, ele pode ser obtido através de
file:///lib/live/image/\fIFILE\fP ou file:///\fIFILE\fP se estiver no sistema raiz
do próprio sistema live.
.br
-Todos os hooks no diretório /lib/live/hooks do sistema de arquivos raiz do
-sistema live podem ser automaticamente habilitados com a palavra\-chave
-\&'filesystem'.
+Todos os hooks no diretório /lib/live/config\-hooks do sistema de arquivos
+raiz do sistema live podem ser automaticamente habilitados com a
+palavra\-chave 'filesystem'.
.br
-Todos os hooks no diretório /live/hooks/ da mídia live podem ser
+Todos os hooks no diretório /live/config\-hooks/ da mídia live podem ser
automaticamente habilitados com a palavra\-chave 'medium'.
.br
Se múltiplos mecanismos são combinados, os hooks do sistema de arquivos são
@@ -366,10 +366,10 @@ mídia live ou um servidor http/ftp.
.IP \fB/var/lib/live/config/\fP 4
.IP \fB/var/log/live/config.log\fP 4
.PP
-.IP \fB/live/hooks/*\fP 4
-.IP \fBlive/hooks/*\fP 4
-.IP \fB/live/preseed/*\fP 4
-.IP "\fBlive/preseed/* \fP" 4
+.IP \fB/live/config\-hooks/*\fP 4
+.IP \fBlive/config\-hooks/*\fP 4
+.IP \fB/live/config\-preseed/*\fP 4
+.IP "\fBlive/config\-preseed/* \fP" 4
.SH "VER TAMBÉM"
\fIlive\-boot\fP(7)
diff --git a/scripts/config/0010-debconf b/scripts/config/0010-debconf
index 67aeaf0..b872ad7 100755
--- a/scripts/config/0010-debconf
+++ b/scripts/config/0010-debconf
@@ -43,16 +43,16 @@ Configure_debconf ()
do
case "${_PRESEED}" in
filesystem)
- if ls /lib/live/preseed/* 2>&1
+ if ls /lib/live/config-preseed/* 2>&1
then
- _PRESEEDS="${_PRESEEDS} $(for _FILE in /lib/live/preseed/*; do echo file://${_FILE}; done)"
+ _PRESEEDS="${_PRESEEDS} $(for _FILE in /lib/live/config-preseed/*; do echo file://${_FILE}; done)"
fi
;;
medium)
- if ls /lib/live/image/live/preseed/* 2>&1
+ if ls /lib/live/image/live/config-preseed/* 2>&1
then
- _PRESEEDS="${_PRESEEDS} $(for _FILE in /lib/live/image/live/preseed/*; do echo file://${_FILE}; done)"
+ _PRESEEDS="${_PRESEEDS} $(for _FILE in /lib/live/image/live/config-preseed/*; do echo file://${_FILE}; done)"
fi
;;
diff --git a/scripts/config/9990-hooks b/scripts/config/9990-hooks
index fa55eb0..dc18eef 100755
--- a/scripts/config/9990-hooks
+++ b/scripts/config/9990-hooks
@@ -40,16 +40,16 @@ Process_hooks ()
do
case "${_HOOK}" in
filesystem)
- if ls /lib/live/hooks/* 2>&1
+ if ls /lib/live/config-hooks/* 2>&1
then
- _HOOKS="${_HOOKS} $(for _FILE in /lib/live/hooks/*; do echo file://${_FILE}; done)"
+ _HOOKS="${_HOOKS} $(for _FILE in /lib/live/config-hooks/*; do echo file://${_FILE}; done)"
fi
;;
medium)
- if ls /lib/live/image/live/hooks/* 2>&1
+ if ls /lib/live/image/live/config-hooks/* 2>&1
then
- _HOOKS="${_HOOKS} $(for _FILE in /lib/live/image/live/hooks/*; do echo file://${_FILE}; done)"
+ _HOOKS="${_HOOKS} $(for _FILE in /lib/live/image/live/config-hooks/*; do echo file://${_FILE}; done)"
fi
;;
--
live-config
More information about the debian-live-changes
mailing list