[SCM] live-config branch, debian, updated. debian/3.0.4-1
Daniel Baumann
daniel at debian.org
Fri Aug 24 09:50:26 UTC 2012
The following commit has been merged in the debian branch:
commit 96d54e71812d14f7e7296cedbd1caa4c4f8a442a
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Aug 14 20:41:02 2012 +0200
Using /etc/live/config/* instead of /etc/live/config.d/*.conf and /live/image/live/config/* instead of /live/image/live/config.d/*.conf for consistency reasons.
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 629eff8..b1d68a5 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -184,10 +184,10 @@ ist der 'boot=live' Parameter trotzdem noch notwendig um \fBlive\-config\fP zu
aktivieren.
.PP
Die Konfigurationsdateien können entweder im Root Dateisystem selbst
-plaziert werden (/etc/live/config.conf, /etc/live/config.d/*.conf) oder auf
-dem Live Medium (live/config.conf, live/config.d/*.conf). Wenn beide Orte
-für eine bestimmte Option verwendet werden, geht die Konfigurationsdatei auf
-dem Live Medium dem der im Root Dateisystem enthaltenen vor.
+plaziert werden (/etc/live/config.conf, /etc/live/config/*) oder auf dem
+Live Medium (live/config.conf, live/config/*). Wenn beide Orte für eine
+bestimmte Option verwendet werden, geht die Konfigurationsdatei auf dem Live
+Medium dem der im Root Dateisystem enthaltenen vor.
.PP
Obwohl die Konfigurationsdateien welche in die conf.d Verzeichnisse abgelegt
werden können keinen bestimmten Namen oder Endung brauchen, ist es aus
@@ -367,9 +367,9 @@ einem HTTP/FTP Server auszuführen.
.SH DATEIEN
.IP \fB/etc/live/config.conf\fP 4
-.IP \fB/etc/live/config.d/*.conf\fP 4
+.IP \fB/etc/live/config/*\fP 4
.IP \fBlive/config.conf\fP 4
-.IP \fBlive/config.d/*.conf\fP 4
+.IP \fBlive/config/*\fP 4
.IP \fB/lib/live/config.sh\fP 4
.IP \fB/lib/live/config/\fP 4
.IP \fB/var/lib/live/config/\fP 4
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 52b3464..3b5a452 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -106,7 +106,7 @@ Enables debug output in live\-config.
.SS Configuration Files
\fBlive\-config\fR can be configured (but not activated) through configuration files. Everything but the shortcuts that can be configured with a boot parameter can be alternatively also be configured through one or more files. If configuration files are used, the 'boot=live' parameter is still required to activate \fBlive\-config\fR.
.PP
-Configuration files can be placed either in the root filesystem itself (/etc/live/config.conf, /etc/live/config.d/*.conf), or on the live media (live/config.conf, live/config.d/*.conf). If both places are used for a certain option, the ones from the live media take precedence over the ones from the root filesystem.
+Configuration files can be placed either in the root filesystem itself (/etc/live/config.conf, /etc/live/config/*), or on the live media (live/config.conf, live/config/*). If both places are used for a certain option, the ones from the live media take precedence over the ones from the root filesystem.
.PP
Although the configuration files placed in the conf.d directories do not require a particular name or suffix, it is suggested for consistency reasons to either use 'vendor.conf' or 'project.conf' as a naming scheme (whereas 'vendor' or 'project' is replaced with the actual name, resulting in a filename like 'debian\-eeepc.conf').
.PP
@@ -242,9 +242,9 @@ allows to run arbitrary commands from a script placed on the live media or an ht
.SH FILES
.IP "\fB/etc/live/config.conf\fR" 4
-.IP "\fB/etc/live/config.d/*.conf\fR" 4
+.IP "\fB/etc/live/config/*\fR" 4
.IP "\fBlive/config.conf\fR" 4
-.IP "\fBlive/config.d/*.conf\fR" 4
+.IP "\fBlive/config/*\fR" 4
.IP "\fB/lib/live/config.sh\fR" 4
.IP "\fB/lib/live/config/\fR" 4
.IP "\fB/var/lib/live/config/\fR" 4
diff --git a/manpages/es/live-config.es.7 b/manpages/es/live-config.es.7
index 883c236..b1af6e7 100644
--- a/manpages/es/live-config.es.7
+++ b/manpages/es/live-config.es.7
@@ -180,10 +180,10 @@ uno o más ficheros. Aunque se utilicen los ficheros de configuración, el
parámetro «boot =live» es necesario para activar \fBlive\-config\fP.
.PP
Los ficheros de configuración se pueden colocar en el sistema de ficheros
-raíz (/etc/live/config.conf, /etc/live/config.d/*.conf), o en el medio en
-vivo (live/config.conf, live/config.d/*.conf). Si ambos directorios se
-utilizan para una determinada opción, la del medio en vivo tienen prioridad
-sobre la del sistema de ficheros raíz.
+raíz (/etc/live/config.conf, /etc/live/config/*), o en el medio en vivo
+(live/config.conf, live/config/*). Si ambos directorios se utilizan para una
+determinada opción, la del medio en vivo tienen prioridad sobre la del
+sistema de ficheros raíz.
.PP
Aunque los ficheros de configuración situados en los directorios conf.d no
requieren un nombre o sufijo en concreto, se sugiere por unificación usar
@@ -356,9 +356,9 @@ el medio en vivo o en un servidor http/ftp.
.SH FICHEROS
.IP \fB/etc/live/config.conf\fP 4
-.IP \fB/etc/live/config.d/*.conf\fP 4
+.IP \fB/etc/live/config/*\fP 4
.IP \fBlive/config.conf\fP 4
-.IP \fBlive/config.d/*.conf\fP 4
+.IP \fBlive/config/*\fP 4
.IP \fB/lib/live/config.sh\fP 4
.IP \fB/lib/live/config/\fP 4
.IP \fB/var/lib/live/config/\fP 4
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index cb2ac69..7903982 100644
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -187,10 +187,10 @@ sont utilisés, le paramètre 'boot=live' est toujours requis pour activer
\fBlive\-config\fP.
.PP
Les fichiers de configuration peuvent être placés soit dans la racine du
-système de fichiers (/etc/live/config.conf, /etc/live/config.d/*.conf), soit
-sur le média live (live/config.conf, live/config.d/*.conf). Si ces deux
-endroits sont utilisés pour une même option, ceux placés dans le média live
-ont la préséance sur ceux placés dans la racine du système.
+système de fichiers (/etc/live/config.conf, /etc/live/config/*), soit sur le
+média live (live/config.conf, live/config/*). Si ces deux endroits sont
+utilisés pour une même option, ceux placés dans le média live ont la
+préséance sur ceux placés dans la racine du système.
.PP
Bien que les fichiers de configuration placés dans les répertoires conf.d ne
requièrent pas de nom ou suffixe particulier, il est suggéré, par souci de
@@ -369,9 +369,9 @@ live, ou sur un serveur http/ftp.
.SH FICHIERS
.IP \fB/etc/live/config.conf\fP 4
-.IP \fB/etc/live/config.d/*.conf\fP 4
+.IP \fB/etc/live/config/*\fP 4
.IP \fBlive/config.conf\fP 4
-.IP \fBlive/config.d/*.conf\fP 4
+.IP \fBlive/config/*\fP 4
.IP \fB/lib/live/config.sh\fP 4
.IP \fB/lib/live/config/\fP 4
.IP \fB/var/lib/live/config/\fP 4
diff --git a/manpages/it/live-config.it.7 b/manpages/it/live-config.it.7
index 8f22444..b0145f4 100644
--- a/manpages/it/live-config.it.7
+++ b/manpages/it/live-config.it.7
@@ -180,9 +180,9 @@ o più file. Se vengono usati questi file, il parametro "boot=live" è
comunque richiesto per attivare \fBlive\-config\fP.
.PP
I file di configurazione sono collocabili sia nello stesso filesystem di
-root (/etc/live/config.conf, /etc/live/config.d/*.conf), sia nel supporto
-live (live/config.conf, live/config.d/*.conf). Se per una certa opzione si
-usano entrambe le destinazioni, avrà la precedenza quello del supporto live.
+root (/etc/live/config.conf, /etc/live/config/*), sia nel supporto live
+(live/config.conf, live/config/*). Se per una certa opzione si usano
+entrambe le destinazioni, avrà la precedenza quello del supporto live.
.PP
Sebbene i file di configurazione messi nelle directory conf.d non richiedano
un nome o un suffisso particolari, per coerenza è suggerito di usare
@@ -358,9 +358,9 @@ live o su un server http/ftp.
.SH FILE
.IP \fB/etc/live/config.conf\fP 4
-.IP \fB/etc/live/config.d/*.conf\fP 4
+.IP \fB/etc/live/config/*\fP 4
.IP \fBlive/config.conf\fP 4
-.IP \fBlive/config.d/*.conf\fP 4
+.IP \fBlive/config/*\fP 4
.IP \fB/lib/live/config.sh\fP 4
.IP \fB/lib/live/config/\fP 4
.IP \fB/var/lib/live/config/\fP 4
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index 499dcdd..9f4bcec 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.3-1\n"
-"POT-Creation-Date: 2012-08-14 12:53+0300\n"
+"POT-Creation-Date: 2012-08-14 20:42+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"
@@ -647,16 +647,15 @@ msgstr ""
#: en/live-config.7:110
msgid ""
"Configuration files can be placed either in the root filesystem itself (/etc/"
-"live/config.conf, /etc/live/config.d/*.conf), or on the live media (live/"
-"config.conf, live/config.d/*.conf). If both places are used for a certain "
-"option, the ones from the live media take precedence over the ones from the "
-"root filesystem."
+"live/config.conf, /etc/live/config/*), or on the live media (live/config."
+"conf, live/config/*). If both places are used for a certain option, the ones "
+"from the live media take precedence over the ones from the root filesystem."
msgstr ""
"Die Konfigurationsdateien können entweder im Root Dateisystem selbst "
-"plaziert werden (/etc/live/config.conf, /etc/live/config.d/*.conf) oder auf "
-"dem Live Medium (live/config.conf, live/config.d/*.conf). Wenn beide Orte "
-"für eine bestimmte Option verwendet werden, geht die Konfigurationsdatei auf "
-"dem Live Medium dem der im Root Dateisystem enthaltenen vor."
+"plaziert werden (/etc/live/config.conf, /etc/live/config/*) oder auf dem "
+"Live Medium (live/config.conf, live/config/*). Wenn beide Orte für eine "
+"bestimmte Option verwendet werden, geht die Konfigurationsdatei auf dem Live "
+"Medium dem der im Root Dateisystem enthaltenen vor."
#. type: Plain text
#: en/live-config.7:112
@@ -1459,8 +1458,8 @@ msgstr "B</etc/live/config.conf>"
#. type: IP
#: en/live-config.7:245
#, no-wrap
-msgid "B</etc/live/config.d/*.conf>"
-msgstr "B</etc/live/config.d/*.conf>"
+msgid "B</etc/live/config/*>"
+msgstr "B</etc/live/config/*>"
#. type: IP
#: en/live-config.7:246
@@ -1471,8 +1470,8 @@ msgstr "B<live/config.conf>"
#. type: IP
#: en/live-config.7:247
#, no-wrap
-msgid "B<live/config.d/*.conf>"
-msgstr "B<live/config.d/*.conf>"
+msgid "B<live/config/*>"
+msgstr "B<live/config/*>"
#. type: IP
#: en/live-config.7:248
diff --git a/manpages/po/es/live-config.7.po b/manpages/po/es/live-config.7.po
index 0f6f238..2840e4d 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.3-1\n"
-"POT-Creation-Date: 2012-08-14 12:53+0300\n"
+"POT-Creation-Date: 2012-08-14 20:42+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"
@@ -640,16 +640,15 @@ msgstr ""
#: en/live-config.7:110
msgid ""
"Configuration files can be placed either in the root filesystem itself (/etc/"
-"live/config.conf, /etc/live/config.d/*.conf), or on the live media (live/"
-"config.conf, live/config.d/*.conf). If both places are used for a certain "
-"option, the ones from the live media take precedence over the ones from the "
-"root filesystem."
+"live/config.conf, /etc/live/config/*), or on the live media (live/config."
+"conf, live/config/*). If both places are used for a certain option, the ones "
+"from the live media take precedence over the ones from the root filesystem."
msgstr ""
"Los ficheros de configuración se pueden colocar en el sistema de ficheros "
-"raíz (/etc/live/config.conf, /etc/live/config.d/*.conf), o en el medio en "
-"vivo (live/config.conf, live/config.d/*.conf). Si ambos directorios se "
-"utilizan para una determinada opción, la del medio en vivo tienen prioridad "
-"sobre la del sistema de ficheros raíz."
+"raíz (/etc/live/config.conf, /etc/live/config/*), o en el medio en vivo "
+"(live/config.conf, live/config/*). Si ambos directorios se utilizan para una "
+"determinada opción, la del medio en vivo tienen prioridad sobre la del "
+"sistema de ficheros raíz."
#. type: Plain text
#: en/live-config.7:112
@@ -1446,8 +1445,8 @@ msgstr "B</etc/live/config.conf>"
#. type: IP
#: en/live-config.7:245
#, no-wrap
-msgid "B</etc/live/config.d/*.conf>"
-msgstr "B</etc/live/config.d/*.conf>"
+msgid "B</etc/live/config/*>"
+msgstr "B</etc/live/config/*>"
#. type: IP
#: en/live-config.7:246
@@ -1458,8 +1457,8 @@ msgstr "B<live/config.conf>"
#. type: IP
#: en/live-config.7:247
#, no-wrap
-msgid "B<live/config.d/*.conf>"
-msgstr "B<live/config.d/*.conf>"
+msgid "B<live/config/*>"
+msgstr "B<live/config/*>"
#. type: IP
#: en/live-config.7:248
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index b07e860..cb626b0 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.3-1\n"
-"POT-Creation-Date: 2012-08-14 12:53+0300\n"
+"POT-Creation-Date: 2012-08-14 20:42+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"
@@ -649,16 +649,15 @@ msgstr ""
#: en/live-config.7:110
msgid ""
"Configuration files can be placed either in the root filesystem itself (/etc/"
-"live/config.conf, /etc/live/config.d/*.conf), or on the live media (live/"
-"config.conf, live/config.d/*.conf). If both places are used for a certain "
-"option, the ones from the live media take precedence over the ones from the "
-"root filesystem."
+"live/config.conf, /etc/live/config/*), or on the live media (live/config."
+"conf, live/config/*). If both places are used for a certain option, the ones "
+"from the live media take precedence over the ones from the root filesystem."
msgstr ""
"Les fichiers de configuration peuvent être placés soit dans la racine du "
-"système de fichiers (/etc/live/config.conf, /etc/live/config.d/*.conf), soit "
-"sur le média live (live/config.conf, live/config.d/*.conf). Si ces deux "
-"endroits sont utilisés pour une même option, ceux placés dans le média live "
-"ont la préséance sur ceux placés dans la racine du système."
+"système de fichiers (/etc/live/config.conf, /etc/live/config/*), soit sur le "
+"média live (live/config.conf, live/config/*). Si ces deux endroits sont "
+"utilisés pour une même option, ceux placés dans le média live ont la "
+"préséance sur ceux placés dans la racine du système."
#. type: Plain text
#: en/live-config.7:112
@@ -1463,8 +1462,8 @@ msgstr "B</etc/live/config.conf>"
#. type: IP
#: en/live-config.7:245
#, no-wrap
-msgid "B</etc/live/config.d/*.conf>"
-msgstr "B</etc/live/config.d/*.conf>"
+msgid "B</etc/live/config/*>"
+msgstr "B</etc/live/config/*>"
#. type: IP
#: en/live-config.7:246
@@ -1475,8 +1474,8 @@ msgstr "B<live/config.conf>"
#. type: IP
#: en/live-config.7:247
#, no-wrap
-msgid "B<live/config.d/*.conf>"
-msgstr "B<live/config.d/*.conf>"
+msgid "B<live/config/*>"
+msgstr "B<live/config/*>"
#. type: IP
#: en/live-config.7:248
diff --git a/manpages/po/it/live-config.7.po b/manpages/po/it/live-config.7.po
index 680e316..4687c14 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.3-1\n"
-"POT-Creation-Date: 2012-08-14 12:53+0300\n"
+"POT-Creation-Date: 2012-08-14 20:42+0300\n"
"PO-Revision-Date: 2012-08-03 17:13+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: none\n"
@@ -640,15 +640,14 @@ msgstr ""
#: en/live-config.7:110
msgid ""
"Configuration files can be placed either in the root filesystem itself (/etc/"
-"live/config.conf, /etc/live/config.d/*.conf), or on the live media (live/"
-"config.conf, live/config.d/*.conf). If both places are used for a certain "
-"option, the ones from the live media take precedence over the ones from the "
-"root filesystem."
+"live/config.conf, /etc/live/config/*), or on the live media (live/config."
+"conf, live/config/*). If both places are used for a certain option, the ones "
+"from the live media take precedence over the ones from the root filesystem."
msgstr ""
"I file di configurazione sono collocabili sia nello stesso filesystem di "
-"root (/etc/live/config.conf, /etc/live/config.d/*.conf), sia nel supporto "
-"live (live/config.conf, live/config.d/*.conf). Se per una certa opzione si "
-"usano entrambe le destinazioni, avrà la precedenza quello del supporto live."
+"root (/etc/live/config.conf, /etc/live/config/*), sia nel supporto live "
+"(live/config.conf, live/config/*). Se per una certa opzione si usano "
+"entrambe le destinazioni, avrà la precedenza quello del supporto live."
#. type: Plain text
#: en/live-config.7:112
@@ -1450,8 +1449,8 @@ msgstr "B</etc/live/config.conf>"
#. type: IP
#: en/live-config.7:245
#, no-wrap
-msgid "B</etc/live/config.d/*.conf>"
-msgstr "B</etc/live/config.d/*.conf>"
+msgid "B</etc/live/config/*>"
+msgstr "B</etc/live/config/*>"
#. type: IP
#: en/live-config.7:246
@@ -1462,8 +1461,8 @@ msgstr "B<live/config.conf>"
#. type: IP
#: en/live-config.7:247
#, no-wrap
-msgid "B<live/config.d/*.conf>"
-msgstr "B<live/config.d/*.conf>"
+msgid "B<live/config/*>"
+msgstr "B<live/config/*>"
#. type: IP
#: en/live-config.7:248
diff --git a/manpages/po/pt_BR/live-config.7.po b/manpages/po/pt_BR/live-config.7.po
index f588abe..ee2df2d 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.3-1\n"
-"POT-Creation-Date: 2012-08-14 12:53+0300\n"
+"POT-Creation-Date: 2012-08-14 20:42+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"
@@ -637,16 +637,15 @@ msgstr ""
#: en/live-config.7:110
msgid ""
"Configuration files can be placed either in the root filesystem itself (/etc/"
-"live/config.conf, /etc/live/config.d/*.conf), or on the live media (live/"
-"config.conf, live/config.d/*.conf). If both places are used for a certain "
-"option, the ones from the live media take precedence over the ones from the "
-"root filesystem."
+"live/config.conf, /etc/live/config/*), or on the live media (live/config."
+"conf, live/config/*). If both places are used for a certain option, the ones "
+"from the live media take precedence over the ones from the root filesystem."
msgstr ""
"Arquivos de configuração podem estar localizados no próprio sistema de "
-"arquivos raiz (/etc/live/config.conf, /etc/live/config.d/*.conf) ou na mídia "
-"live (live/config.conf, live/config.d/*.conf). Se ambas as localizações são "
-"usadas para determinada opção, as da mídia live assumem precedência sobre as "
-"do sistema de arquivo raiz."
+"arquivos raiz (/etc/live/config.conf, /etc/live/config/*) ou na mídia live "
+"(live/config.conf, live/config/*). Se ambas as localizações são usadas para "
+"determinada opção, as da mídia live assumem precedência sobre as do sistema "
+"de arquivo raiz."
#. type: Plain text
#: en/live-config.7:112
@@ -1453,8 +1452,8 @@ msgstr "B</etc/live/config.conf>"
#. type: IP
#: en/live-config.7:245
#, no-wrap
-msgid "B</etc/live/config.d/*.conf>"
-msgstr "B</etc/live/config.d/*.conf>"
+msgid "B</etc/live/config/*>"
+msgstr "B</etc/live/config/*>"
#. type: IP
#: en/live-config.7:246
@@ -1465,8 +1464,8 @@ msgstr "B<live/config.conf>"
#. type: IP
#: en/live-config.7:247
#, no-wrap
-msgid "B<live/config.d/*.conf>"
-msgstr "B<live/config.d/*.conf>"
+msgid "B<live/config/*>"
+msgstr "B<live/config/*>"
#. type: IP
#: en/live-config.7:248
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index c875220..b1ae288 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-08-14 12:53+0300\n"
+"POT-Creation-Date: 2012-08-14 20:42+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"
@@ -541,10 +541,9 @@ msgstr ""
#: en/live-config.7:110
msgid ""
"Configuration files can be placed either in the root filesystem itself (/etc/"
-"live/config.conf, /etc/live/config.d/*.conf), or on the live media (live/"
-"config.conf, live/config.d/*.conf). If both places are used for a certain "
-"option, the ones from the live media take precedence over the ones from the "
-"root filesystem."
+"live/config.conf, /etc/live/config/*), or on the live media (live/config."
+"conf, live/config/*). If both places are used for a certain option, the ones "
+"from the live media take precedence over the ones from the root filesystem."
msgstr ""
#. type: Plain text
@@ -1282,7 +1281,7 @@ msgstr ""
#. type: IP
#: en/live-config.7:245
#, no-wrap
-msgid "B</etc/live/config.d/*.conf>"
+msgid "B</etc/live/config/*>"
msgstr ""
#. type: IP
@@ -1294,7 +1293,7 @@ msgstr ""
#. type: IP
#: en/live-config.7:247
#, no-wrap
-msgid "B<live/config.d/*.conf>"
+msgid "B<live/config/*>"
msgstr ""
#. type: IP
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index 0b18748..1afc2c5 100644
--- a/manpages/pt_BR/live-config.pt_BR.7
+++ b/manpages/pt_BR/live-config.pt_BR.7
@@ -177,10 +177,10 @@ com exceção dos atalhos. Quando arquivos de configuração são usados, o
parâmetro 'boot=live' ainda é necessário para a ativação do \fBlive\-config\fP.
.PP
Arquivos de configuração podem estar localizados no próprio sistema de
-arquivos raiz (/etc/live/config.conf, /etc/live/config.d/*.conf) ou na mídia
-live (live/config.conf, live/config.d/*.conf). Se ambas as localizações são
-usadas para determinada opção, as da mídia live assumem precedência sobre as
-do sistema de arquivo raiz.
+arquivos raiz (/etc/live/config.conf, /etc/live/config/*) ou na mídia live
+(live/config.conf, live/config/*). Se ambas as localizações são usadas para
+determinada opção, as da mídia live assumem precedência sobre as do sistema
+de arquivo raiz.
.PP
Apesar de os arquivos de configuração localizados nos diretórios conf.d não
necessitarem de um nome ou sufixo particular, por uma questão de
@@ -358,9 +358,9 @@ mídia live ou um servidor http/ftp.
.SH ARQUIVOS
.IP \fB/etc/live/config.conf\fP 4
-.IP \fB/etc/live/config.d/*.conf\fP 4
+.IP \fB/etc/live/config/*\fP 4
.IP \fBlive/config.conf\fP 4
-.IP \fBlive/config.d/*.conf\fP 4
+.IP \fBlive/config/*\fP 4
.IP \fB/lib/live/config.sh\fP 4
.IP \fB/lib/live/config/\fP 4
.IP \fB/var/lib/live/config/\fP 4
diff --git a/scripts/config.sh b/scripts/config.sh
index 89c3176..b75bc1e 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -168,8 +168,8 @@ Main ()
trap 'Trap' EXIT HUP INT QUIT TERM
# Reading configuration file from filesystem and live-media
- for _FILE in /etc/live/config.conf /etc/live/config.d/*.conf \
- /live/image/live/config.conf /live/image/live/config.d/*.conf
+ for _FILE in /etc/live/config.conf /etc/live/config/* \
+ /live/image/live/config.conf /live/image/live/config/*
do
if [ -e "${_FILE}" ]
then
--
live-config
More information about the debian-live-changes
mailing list