[SCM] live-config branch, debian-next, updated. debian/3.0_a4-1-1-gcfc3906
Daniel Baumann
daniel at debian.org
Thu Sep 2 19:28:26 UTC 2010
The following commit has been merged in the debian-next branch:
commit cfc39065542f5c078c8a997799c8a758bc7fe8b6
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 2 21:26:07 2010 +0200
Using config.d instead of config.conf.d as directory name for custom configuration files.
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 4992c7e..11f9898 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -153,10 +153,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.conf.d/) oder auf
-dem Live Medium (live/config.conf, live/config.conf.d/). 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.d/) oder auf dem
+Live Medium (live/config.conf, live/config.d/). 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
@@ -317,9 +317,9 @@ einem HTTP/FTP Server auszuführen.
.SH DATEIEN
.IP \fB/etc/live/config.conf\fP 4
-.IP \fB/etc/live/config.conf.d/\fP 4
+.IP \fB/etc/live/config.d/\fP 4
.IP \fBlive/config.conf\fP 4
-.IP \fBlive/config.conf.d/\fP 4
+.IP \fBlive/config.d/\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 ed09976..9f6ed38 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -92,7 +92,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.conf.d/), or on the live media (live/config.conf, live/config.conf.d/). 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.d/), or on the live media (live/config.conf, live/config.d/). 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's suggest for consistency 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').
@@ -214,9 +214,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.conf.d/\fR" 4
+.IP "\fB/etc/live/config.d/\fR" 4
.IP "\fBlive/config.conf\fR" 4
-.IP "\fBlive/config.conf.d/\fR" 4
+.IP "\fBlive/config.d/\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/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index 23ada16..5afed29 100644
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -156,10 +156,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.conf.d/), soit
-sur le média live (live/config.conf, live/config.conf.d/). 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.d/), soit sur
+le média live (live/config.conf, live/config.d/). 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
@@ -319,9 +319,9 @@ média live, ou sur un serveur http/ftp.
.SH FICHIERS
.IP \fB/etc/live/config.conf\fP 4
-.IP \fB/etc/live/config.conf.d/\fP 4
+.IP \fB/etc/live/config.d/\fP 4
.IP \fBlive/config.conf\fP 4
-.IP \fBlive/config.conf.d/\fP 4
+.IP \fBlive/config.d/\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 caec8c3..eb66845 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~a4\n"
-"POT-Creation-Date: 2010-09-02 18:33+0300\n"
+"POT-Creation-Date: 2010-09-02 21:25+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"
@@ -563,16 +563,16 @@ msgstr ""
#: en/live-config.7:96
msgid ""
"Configuration files can be placed either in the root filesystem itself (/etc/"
-"live/config.conf, /etc/live/config.conf.d/), or on the live media (live/"
-"config.conf, live/config.conf.d/). 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.d/), or on the live media (live/config."
+"conf, live/config.d/). 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.conf.d/) oder auf "
-"dem Live Medium (live/config.conf, live/config.conf.d/). 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.d/) oder auf dem "
+"Live Medium (live/config.conf, live/config.d/). 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:98
@@ -1289,8 +1289,8 @@ msgstr "B</etc/live/config.conf>"
#. type: IP
#: en/live-config.7:217
#, no-wrap
-msgid "B</etc/live/config.conf.d/>"
-msgstr "B</etc/live/config.conf.d/>"
+msgid "B</etc/live/config.d/>"
+msgstr "B</etc/live/config.d/>"
#. type: IP
#: en/live-config.7:218
@@ -1301,8 +1301,8 @@ msgstr "B<live/config.conf>"
#. type: IP
#: en/live-config.7:219
#, no-wrap
-msgid "B<live/config.conf.d/>"
-msgstr "B<live/config.conf.d/>"
+msgid "B<live/config.d/>"
+msgstr "B<live/config.d/>"
#. type: IP
#: en/live-config.7:220
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index 08df1c0..7b68d8f 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 3.0~a4\n"
-"POT-Creation-Date: 2010-09-02 18:33+0300\n"
+"POT-Creation-Date: 2010-09-02 21:25+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Thierry Lépicier <thierry.lepicier at free.fr>\n"
"Language-Team: none\n"
@@ -565,16 +565,16 @@ msgstr ""
#: en/live-config.7:96
msgid ""
"Configuration files can be placed either in the root filesystem itself (/etc/"
-"live/config.conf, /etc/live/config.conf.d/), or on the live media (live/"
-"config.conf, live/config.conf.d/). 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.d/), or on the live media (live/config."
+"conf, live/config.d/). 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.conf.d/), soit "
-"sur le média live (live/config.conf, live/config.conf.d/). 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.d/), soit sur "
+"le média live (live/config.conf, live/config.d/). 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:98
@@ -1291,8 +1291,8 @@ msgstr "B</etc/live/config.conf>"
#. type: IP
#: en/live-config.7:217
#, no-wrap
-msgid "B</etc/live/config.conf.d/>"
-msgstr "B</etc/live/config.conf.d/>"
+msgid "B</etc/live/config.d/>"
+msgstr "B</etc/live/config.d/>"
#. type: IP
#: en/live-config.7:218
@@ -1303,8 +1303,8 @@ msgstr "B<live/config.conf>"
#. type: IP
#: en/live-config.7:219
#, no-wrap
-msgid "B<live/config.conf.d/>"
-msgstr "B<live/config.conf.d/>"
+msgid "B<live/config.d/>"
+msgstr "B<live/config.d/>"
#. type: IP
#: en/live-config.7:220
diff --git a/manpages/po/pt_BR/live-config.7.po b/manpages/po/pt_BR/live-config.7.po
index 3472387..743661c 100644
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 3.0~a4\n"
-"POT-Creation-Date: 2010-09-02 18:33+0300\n"
+"POT-Creation-Date: 2010-09-02 21:25+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Tassia Camoes Araujo <tassia at gmail.com>\n"
"Language-Team: none\n"
@@ -550,16 +550,16 @@ msgstr ""
#: en/live-config.7:96
msgid ""
"Configuration files can be placed either in the root filesystem itself (/etc/"
-"live/config.conf, /etc/live/config.conf.d/), or on the live media (live/"
-"config.conf, live/config.conf.d/). 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.d/), or on the live media (live/config."
+"conf, live/config.d/). 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.conf.d/) ou na mídia "
-"live (live/config.conf, live/config.conf.d/). 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.d/) ou na mídia live "
+"(live/config.conf, live/config.d/). 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:98
@@ -1280,8 +1280,8 @@ msgstr "B</etc/live/config.conf>"
#. type: IP
#: en/live-config.7:217
#, no-wrap
-msgid "B</etc/live/config.conf.d/>"
-msgstr "B</etc/live/config.conf.d/>"
+msgid "B</etc/live/config.d/>"
+msgstr "B</etc/live/config.d/>"
#. type: IP
#: en/live-config.7:218
@@ -1292,8 +1292,8 @@ msgstr "B<live/config.conf>"
#. type: IP
#: en/live-config.7:219
#, no-wrap
-msgid "B<live/config.conf.d/>"
-msgstr "B<live/config.conf.d/>"
+msgid "B<live/config.d/>"
+msgstr "B<live/config.d/>"
#. type: IP
#: en/live-config.7:220
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 06ab091..cb69d2e 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: 2010-09-02 18:33+0300\n"
+"POT-Creation-Date: 2010-09-02 21:25+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"
@@ -479,10 +479,10 @@ msgstr ""
#: en/live-config.7:96
msgid ""
"Configuration files can be placed either in the root filesystem itself (/etc/"
-"live/config.conf, /etc/live/config.conf.d/), or on the live media (live/"
-"config.conf, live/config.conf.d/). 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.d/), or on the live media (live/config."
+"conf, live/config.d/). 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
@@ -1141,7 +1141,7 @@ msgstr ""
#. type: IP
#: en/live-config.7:217
#, no-wrap
-msgid "B</etc/live/config.conf.d/>"
+msgid "B</etc/live/config.d/>"
msgstr ""
#. type: IP
@@ -1153,7 +1153,7 @@ msgstr ""
#. type: IP
#: en/live-config.7:219
#, no-wrap
-msgid "B<live/config.conf.d/>"
+msgid "B<live/config.d/>"
msgstr ""
#. type: IP
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index b738a6c..3f23709 100644
--- a/manpages/pt_BR/live-config.pt_BR.7
+++ b/manpages/pt_BR/live-config.pt_BR.7
@@ -145,10 +145,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.conf.d/) ou na mídia
-live (live/config.conf, live/config.conf.d/). 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.d/) ou na mídia live
+(live/config.conf, live/config.d/). 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
@@ -307,9 +307,9 @@ mídia live ou um servidor http/ftp.
.SH ARQUIVOS
.IP \fB/etc/live/config.conf\fP 4
-.IP \fB/etc/live/config.conf.d/\fP 4
+.IP \fB/etc/live/config.d/\fP 4
.IP \fBlive/config.conf\fP 4
-.IP \fBlive/config.conf.d/\fP 4
+.IP \fBlive/config.d/\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 db8c945..5d1404d 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -221,9 +221,9 @@ Main ()
. /etc/live/config.conf
fi
- if ls /etc/live/config.conf.d/* > /dev/null 2>&1
+ if ls /etc/live/config.d/* > /dev/null 2>&1
then
- for _FILE in /etc/live/config.conf.d/*
+ for _FILE in /etc/live/config.d/*
do
. ${_FILE}
done
@@ -235,9 +235,9 @@ Main ()
. /live/image/live/config.conf
fi
- if ls /live/image/live/config.conf.d/* > /dev/null 2>&1
+ if ls /live/image/live/config.d/* > /dev/null 2>&1
then
- for FILE in /live/image/live/config.conf.d/*
+ for FILE in /live/image/live/config.d/*
do
. ${_FILE}
done
--
live-config
More information about the debian-live-changes
mailing list