[SCM] live-config branch, upstream, updated. upstream/2.0.3-1-g82a30a6
Daniel Baumann
daniel at debian.org
Thu Sep 2 20:40:58 UTC 2010
The following commit has been merged in the upstream branch:
commit 82a30a6cdc2c6a5726938ffcc6856acaf6cdef43
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 2 22:35:19 2010 +0200
Adding upstream version 2.0.4.
diff --git a/VERSION b/VERSION
index 50ffc5a..2165f8f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.3
+2.0.4
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 549abf2..d9e523c 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 02.09.2010 2.0.3 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 02.09.2010 2.0.4 "Debian Live Projekt"
.SH NAME
\fBlive\-config\fP \- System Konfiguration Skripte
@@ -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
@@ -293,8 +293,8 @@ schaltet den KDE Migration Wizard ab (squeeze und neuer).
schaltet ein paar ungewollte KDE Services ab (squeeze und neuer).
.IP \fBkpersonalizer\fP 4
schaltet den KDE Configuration Wizard ab (lenny).
-.IP \fBlive\-installer\-launcher\fP 4
-fügt live\-installer\-launcher auf dem Benutzer Desktop hinzu.
+.IP \fBdebian\-installer\-launcher\fP 4
+fügt debian\-installer\-launcher auf dem Benutzer Desktop hinzu.
.IP \fBmodule\-init\-tools\fP 4
lädt automatisch gewisse Module auf bestimmten Architekturen.
.IP \fBpolicykit\fP 4
@@ -319,9 +319,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 3ceb8a4..03197d2 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
-.TH LIVE\-CONFIG 7 2010\-09\-02 2.0.3 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2010\-09\-02 2.0.4 "Debian Live Project"
.SH NAME
\fBlive\-config\fR \- System Configuration Scripts
@@ -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').
@@ -191,8 +191,8 @@ disables kde migration wizard (squeeze and newer).
disables some unwanted KDE services (squeeze and newer).
.IP "\fBkpersonalizer\fR" 4
disables kde configuration wizard (lenny).
-.IP "\fBlive\-installer\-launcher\fR" 4
-adds live\-installer\-launcher on users desktop.
+.IP "\fBdebian\-installer\-launcher\fR" 4
+adds debian\-installer\-launcher on users desktop.
.IP "\fBmodule\-init\-tools\fR" 4
automatically load some modules on some architectures.
.IP "\fBpolicykit\fR" 4
@@ -216,9 +216,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 ff6fbb3..98cf1b9 100644
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 02.09.2010 2.0.3 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 02.09.2010 2.0.4 "Projet Debian Live"
.SH NOM
\fBlive\-config\fP \- Scripts de configuration du système
@@ -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
@@ -294,8 +294,8 @@ désactive l'assistant de migration de kde (squeeze et plus récent).
désactive des services de KDE non souhaités (squeeze et plus récent).
.IP \fBkerpsonalizer\fP 4
désactive le lancement du paramétrage de configuration de kde (lenny).
-.IP \fBlive\-installer\-launcher\fP 4
-ajoute l'installeur (live\-installer\-launcher) sur le bureau des
+.IP \fBdebian\-installer\-launcher\fP 4
+ajoute l'installeur (debian\-installer\-launcher) sur le bureau des
utilisateurs.
.IP \fBmodule\-init\-tools\fP 4
charge automatiquement certains modules sur certaines architectures.
@@ -321,9 +321,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 df5c1c4..acde056 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 2.0.3\n"
-"POT-Creation-Date: 2010-09-02 18:36+0300\n"
+"Project-Id-Version: live-config 2.0.4\n"
+"POT-Creation-Date: 2010-09-02 22:33+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"
@@ -30,8 +30,8 @@ msgstr "02.09.2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.3"
-msgstr "2.0.3"
+msgid "2.0.4"
+msgstr "2.0.4"
#. type: TH
#: en/live-config.7:9
@@ -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
@@ -1174,13 +1174,13 @@ msgstr "schaltet den KDE Configuration Wizard ab (lenny)."
#. type: IP
#: en/live-config.7:194
#, no-wrap
-msgid "B<live-installer-launcher>"
-msgstr "B<live-installer-launcher>"
+msgid "B<debian-installer-launcher>"
+msgstr "B<debian-installer-launcher>"
#. type: Plain text
#: en/live-config.7:196
-msgid "adds live-installer-launcher on users desktop."
-msgstr "fügt live-installer-launcher auf dem Benutzer Desktop hinzu."
+msgid "adds debian-installer-launcher on users desktop."
+msgstr "fügt debian-installer-launcher auf dem Benutzer Desktop hinzu."
#. type: IP
#: en/live-config.7:196
@@ -1300,8 +1300,8 @@ msgstr "B</etc/live/config.conf>"
#. type: IP
#: en/live-config.7:219
#, 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:220
@@ -1312,8 +1312,8 @@ msgstr "B<live/config.conf>"
#. type: IP
#: en/live-config.7:221
#, 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:222
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index 638d5c6..ceea9f4 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 2.0.3\n"
-"POT-Creation-Date: 2010-09-02 18:36+0300\n"
+"Project-Id-Version: live-config 2.0.4\n"
+"POT-Creation-Date: 2010-09-02 22:33+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"
@@ -30,8 +30,8 @@ msgstr "02.09.2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.3"
-msgstr "2.0.3"
+msgid "2.0.4"
+msgstr "2.0.4"
#. type: TH
#: en/live-config.7:9
@@ -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
@@ -1175,14 +1175,15 @@ msgstr "désactive le lancement du paramétrage de configuration de kde (lenny).
#. type: IP
#: en/live-config.7:194
#, no-wrap
-msgid "B<live-installer-launcher>"
-msgstr "B<live-installer-launcher>"
+msgid "B<debian-installer-launcher>"
+msgstr "B<debian-installer-launcher>"
#. type: Plain text
#: en/live-config.7:196
-msgid "adds live-installer-launcher on users desktop."
+msgid "adds debian-installer-launcher on users desktop."
msgstr ""
-"ajoute l'installeur (live-installer-launcher) sur le bureau des utilisateurs."
+"ajoute l'installeur (debian-installer-launcher) sur le bureau des "
+"utilisateurs."
#. type: IP
#: en/live-config.7:196
@@ -1302,8 +1303,8 @@ msgstr "B</etc/live/config.conf>"
#. type: IP
#: en/live-config.7:219
#, 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:220
@@ -1314,8 +1315,8 @@ msgstr "B<live/config.conf>"
#. type: IP
#: en/live-config.7:221
#, 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:222
diff --git a/manpages/po/pt_BR/live-config.7.po b/manpages/po/pt_BR/live-config.7.po
index 3a80949..5364a1e 100644
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 2.0.3\n"
-"POT-Creation-Date: 2010-09-02 18:36+0300\n"
+"Project-Id-Version: live-config 2.0.4\n"
+"POT-Creation-Date: 2010-09-02 22:33+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"
@@ -29,8 +29,8 @@ msgstr "02-09-2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.3"
-msgstr "2.0.3"
+msgid "2.0.4"
+msgstr "2.0.4"
#. type: TH
#: en/live-config.7:9
@@ -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
@@ -1163,14 +1163,14 @@ msgstr "desabilita o assistente de configura do kde (lenny)."
#. type: IP
#: en/live-config.7:194
#, no-wrap
-msgid "B<live-installer-launcher>"
-msgstr "B<live-installer-launcher>"
+msgid "B<debian-installer-launcher>"
+msgstr "B<debian-installer-launcher>"
#. type: Plain text
#: en/live-config.7:196
-msgid "adds live-installer-launcher on users desktop."
+msgid "adds debian-installer-launcher on users desktop."
msgstr ""
-"adiciona o instalador (live-installer-launcher) na área de trabalho dos "
+"adiciona o instalador (debian-installer-launcher) na área de trabalho dos "
"usuários."
#. type: IP
@@ -1291,8 +1291,8 @@ msgstr "B</etc/live/config.conf>"
#. type: IP
#: en/live-config.7:219
#, 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:220
@@ -1303,8 +1303,8 @@ msgstr "B<live/config.conf>"
#. type: IP
#: en/live-config.7:221
#, 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:222
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 2e10462..705a049 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:36+0300\n"
+"POT-Creation-Date: 2010-09-02 22:33+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"
@@ -31,7 +31,7 @@ msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.3"
+msgid "2.0.4"
msgstr ""
#. type: TH
@@ -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
@@ -1028,12 +1028,12 @@ msgstr ""
#. type: IP
#: en/live-config.7:194
#, no-wrap
-msgid "B<live-installer-launcher>"
+msgid "B<debian-installer-launcher>"
msgstr ""
#. type: Plain text
#: en/live-config.7:196
-msgid "adds live-installer-launcher on users desktop."
+msgid "adds debian-installer-launcher on users desktop."
msgstr ""
#. type: IP
@@ -1152,7 +1152,7 @@ msgstr ""
#. type: IP
#: en/live-config.7:219
#, no-wrap
-msgid "B</etc/live/config.conf.d/>"
+msgid "B</etc/live/config.d/>"
msgstr ""
#. type: IP
@@ -1164,7 +1164,7 @@ msgstr ""
#. type: IP
#: en/live-config.7:221
#, 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 f4f7a11..3e57d6b 100644
--- a/manpages/pt_BR/live-config.pt_BR.7
+++ b/manpages/pt_BR/live-config.pt_BR.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 02\-09\-2010 2.0.3 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 02\-09\-2010 2.0.4 "Projeto Debian Live"
.SH NOME
\fBlive\-config\fP \- Scripts para Configuração do Sistema
@@ -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
@@ -282,8 +282,8 @@ desabilita o assitente de migração do kde.
desabilita alguns serviços do KDE não desejados (squeeze e mais recentes).
.IP \fBkpersonalizer\fP 4
desabilita o assistente de configura do kde (lenny).
-.IP \fBlive\-installer\-launcher\fP 4
-adiciona o instalador (live\-installer\-launcher) na área de trabalho dos
+.IP \fBdebian\-installer\-launcher\fP 4
+adiciona o instalador (debian\-installer\-launcher) na área de trabalho dos
usuários.
.IP \fBmodule\-init\-tools\fP 4
carrega alguns módulos automaticamente em algumas arquiteturas.
@@ -309,9 +309,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
diff --git a/scripts/config/109-live-installer-launcher b/scripts/config/109-debian-installer-launcher
similarity index 55%
rename from scripts/config/109-live-installer-launcher
rename to scripts/config/109-debian-installer-launcher
index 68c67b5..2894f5b 100755
--- a/scripts/config/109-live-installer-launcher
+++ b/scripts/config/109-debian-installer-launcher
@@ -8,27 +8,27 @@
## under certain conditions; see COPYING for details.
-Live_installer_launcher ()
+Debian_installer_launcher ()
{
# Checking if package is installed or already configured
- if [ ! -e /var/lib/dpkg/info/live-installer-launcher.list ] || \
- [ -e /var/lib/live/config/live-installer-launcher ]
+ if [ ! -e /var/lib/dpkg/info/debian-installer-launcher.list ] || \
+ [ -e /var/lib/live/config/debian-installer-launcher ]
then
return
fi
- echo -n " live-installer-launcher"
+ echo -n " debian-installer-launcher"
- Configure_live_installer_launcher
+ Configure_debian_installer_launcher
}
-Configure_live_installer_launcher ()
+Configure_debian_installer_launcher ()
{
- install -D -o ${LIVE_USERNAME} -g ${LIVE_USERNAME} /usr/share/applications/live-installer-launcher.desktop /home/${LIVE_USERNAME}/Desktop/live-installer-launcher.desktop
+ install -D -o ${LIVE_USERNAME} -g ${LIVE_USERNAME} /usr/share/applications/debian-installer-launcher.desktop /home/${LIVE_USERNAME}/Desktop/debian-installer-launcher.desktop
chown ${LIVE_USERNAME}:${LIVE_USERNAME} /home/${LIVE_USERNAME}/Desktop -R
# Creating state file
- touch /var/lib/live/config/live-installer-launcher
+ touch /var/lib/live/config/debian-installer-launcher
}
-Live_installer_launcher
+Debian_installer_launcher
--
live-config
More information about the debian-live-changes
mailing list