[SCM] live-config branch, upstream, updated. upstream/2.0_a17-1-g840cabf
Daniel Baumann
daniel at debian.org
Mon Aug 9 22:12:26 UTC 2010
The following commit has been merged in the upstream branch:
commit 840cabffabe96a264d04e9010483f9ba1a22cf90
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Aug 10 00:05:03 2010 +0200
Adding upstream version 2.0.0.
diff --git a/VERSION b/VERSION
index 321315d..227cea2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0~a17
+2.0.0
diff --git a/docs/TODO b/docs/TODO
index 5cd9e65..730087e 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -2,17 +2,7 @@ TODO
====
-1. Status
-
-live-config works quite well already, however, it's software in development and
-we continue to release pre-releases until:
-
- * documentation is more complete.
- * boot parameters don't change anymore and we agreed on a common layout of
- everything.
-
-
-2. Regressions
+1. Regressions
Everything that worked with live-initramfs works with live-boot/live-config,
except for the following things:
@@ -25,8 +15,10 @@ except for the following things:
at the manpage of live-config.
-3. Todo items
+2. Todo items
+ * makeing plugins infrastructure self-contained
+ * making plugins post- and pre- login processing
* verify modifications with a d-i sample installation.
* allow some scripts (most prominently locales) to be run even in persistent mode.
* use verbose/quiet/interactive modes for scripts.
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 21beb6b..149d8be 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 29.07.2010 2.0~a17 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 10.08.2010 2.0.0 "Debian Live Projekt"
.SH NAME
\fBlive\-config\fP \- System Konfiguration Skripte
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 0225a85..41836a6 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\-07\-29 2.0~a17 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2010\-08\-10 2.0.0 "Debian Live Project"
.SH NAME
\fBlive\-config\fR \- System Configuration Scripts
@@ -18,7 +18,7 @@
\fBlive\-config\fR can be configured through boot parameters or configuration files. If both mechanisms are used for a certain option, the boot parameters take precedence over the configuration files. When using persistency, \fBlive\-config\fR scripts are only run once.
.SS Boot Parameters (scripts)
-\fBlive\-config\fR is only activated if 'boot=live' is used as a boot parameter. Additionally, \fBlive\-config\fR needs to be told which scripts to run trough the 'live\-config' parameter or which scripts to not run through the 'live\-noconfig' parameter. If both 'live\-config' and 'live\-noconfig' are used, or, if either one is specified multiple times, always the later one takes precedence over the previous one(s).
+\fBlive\-config\fR is only activated if 'boot=live' is used as a boot parameter. Additionally, \fBlive\-config\fR needs to be told which scripts to run through the 'live\-config' parameter or which scripts to not run through the 'live\-noconfig' parameter. If both 'live\-config' and 'live\-noconfig' are used, or, if either one is specified multiple times, always the later one takes precedence over the previous one(s).
.IP "\fBlive\-config\fR" 4
All scripts are run. This is what Debian Live images use by default.
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index 362d7ab..b002e72 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 29.07.2010 2.0~a17 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 10.08.2010 2.0.0 "Projet Debian Live"
.SH NOM
\fBlive\-config\fP \- Scripts de configuration du système
@@ -77,7 +77,7 @@ réglée sur UTC. Par défaut 'oui'.
.IP "\fBlive\-config.keyboard\-model\fP=\fIMODELE_DE_CLAVIER\fP | \fBkeyboard\-model\fP=\fIMODELE_DE_CLAVIER\fP" 4
Permet de changer le modèle de clavier. Aucune valeur par défaut n'est
indiquée.
-.IP "\fBlive\-config.keyboard\-layouts\fP=\fICONFIGURATION_DU_CLAVIER1\fP,\fICONFIGURATION_DU_CLAVIER2\fP ... \fICONFIGURATION_DU_CLAVIERn\fP | \fBkeyboard\-layouts\fP=\fICONFIGURATION_DU_CLAVIER1\fP,\fICONFIGURATION_DU_CLAVIER2\fP ... \fICONFIGURATION_DU_CLAVIERn\fP" 4
+.IP "\fBlive\-config.keyboard\-layouts\fP=\fICONFIGURATION1_DU_CLAVIER\fP,\fICONFIGURATION2_DU_CLAVIER\fP ... \fICONFIGURATIONn_DU_CLAVIER\fP | \fBkeyboard\-layouts\fP=\fICONFIGURATION1_DU_CLAVIER\fP,\fICONFIGURATION2_DU_CLAVIER\fP ... \fICONFIGURATIONn_DU_CLAVIER\fP" 4
Permet de changer la configuration du clavier. Si plus d'une configuration
est spécifiée, les utilitaires de l'environnement de bureau permettront de
passer de l'une à l'autre sous X11. Aucune valeur par défaut n'est
@@ -217,7 +217,7 @@ Cette variable correspond au paramètre
Cette variable correspond au paramètre
\&'\fBlive\-config.hooks\fP=filesystem|medium|\fIURL1\fP|\fIURL2\fP| ... |\fIURLn\fP'.
-.SH CUSTOMIZATION
+.SH CUSTOMISATION
\fBlive\-config\fP peut être facilement customisé pour des projets dérivés, ou
pour un usage local.
@@ -231,12 +231,13 @@ Debian. Un simple paquet contenant un script d'exemple est proposé dans
/usr/share/doc/live\-config/examples.
.SS "Enlever des scripts de configuration existant"
-It's not really possible to remove scripts itself in a sane way yet without
-requiring to ship a locally modified \fBlive\-config\fP package. However, the
-same can be acchieved by disabling the respective scripts through the
-live\-noconfig mechanism, see above. To avoid to always need specifing
-disabled scripts through the boot parameter, a configuration file should be
-used, see above.
+Il n'est pas encore vraiment possible d'enlever sans problème les scripts
+sans avoir besoin de charger un paquet \fBlive\-config\fP modifié
+localement. Cependant, on peut réaliser une chose similaire en désactivant
+les scripts respectifs via le mécanisme live\-noconfig, comme indiqué
+ci\-dessus. Afin d'éviter d'avoir à spécifier les scripts désactivés en
+passant par le paramètre de lancement, vous devriez utiliser un fichier de
+configuration, voir ci\-dessus.
.PP
Les fichiers de configuration pour le système live devront de préférence
être inclus dans leur propre paquet debian. Un simple paquet contenant un
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index 881eb3b..dd05e67 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~a17\n"
-"POT-Creation-Date: 2010-07-29 16:55+0300\n"
+"Project-Id-Version: live-config 2.0.0\n"
+"POT-Creation-Date: 2010-08-10 00:00+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"
@@ -24,14 +24,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-07-29"
-msgstr "29.07.2010"
+msgid "2010-08-10"
+msgstr "10.08.2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0~a17"
-msgstr "2.0~a17"
+msgid "2.0.0"
+msgstr ""
#. type: TH
#: en/live-config.7:9
@@ -95,7 +95,7 @@ msgstr "Boot Parameter (Skripte)"
#: en/live-config.7:22
msgid ""
"B<live-config> is only activated if 'boot=live' is used as a boot parameter. "
-"Additionally, B<live-config> needs to be told which scripts to run trough "
+"Additionally, B<live-config> needs to be told which scripts to run through "
"the 'live-config' parameter or which scripts to not run through the 'live-"
"noconfig' parameter. If both 'live-config' and 'live-noconfig' are used, or, "
"if either one is specified multiple times, always the later one takes "
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index 094deb7..26cdf9a 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~a17\n"
-"POT-Creation-Date: 2010-07-29 16:55+0300\n"
+"Project-Id-Version: live-config 2.0.0\n"
+"POT-Creation-Date: 2010-08-10 00:00+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"
@@ -24,14 +24,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-07-29"
-msgstr "29.07.2010"
+msgid "2010-08-10"
+msgstr "10.08.2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0~a17"
-msgstr "2.0~a17"
+msgid "2.0.0"
+msgstr ""
#. type: TH
#: en/live-config.7:9
@@ -95,7 +95,7 @@ msgstr "Parametères d'amorçage (scripts)"
#: en/live-config.7:22
msgid ""
"B<live-config> is only activated if 'boot=live' is used as a boot parameter. "
-"Additionally, B<live-config> needs to be told which scripts to run trough "
+"Additionally, B<live-config> needs to be told which scripts to run through "
"the 'live-config' parameter or which scripts to not run through the 'live-"
"noconfig' parameter. If both 'live-config' and 'live-noconfig' are used, or, "
"if either one is specified multiple times, always the later one takes "
@@ -289,7 +289,7 @@ msgstr ""
#: en/live-config.7:49
#, no-wrap
msgid "B<live-config.keyboard-layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn> | B<keyboard-layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>"
-msgstr "B<live-config.keyboard-layouts>=I<CONFIGURATION_DU_CLAVIER1>,I<CONFIGURATION_DU_CLAVIER2> ... I<CONFIGURATION_DU_CLAVIERn> | B<keyboard-layouts>=I<CONFIGURATION_DU_CLAVIER1>,I<CONFIGURATION_DU_CLAVIER2> ... I<CONFIGURATION_DU_CLAVIERn>"
+msgstr "B<live-config.keyboard-layouts>=I<CONFIGURATION1_DU_CLAVIER>,I<CONFIGURATION2_DU_CLAVIER> ... I<CONFIGURATIONn_DU_CLAVIER> | B<keyboard-layouts>=I<CONFIGURATION1_DU_CLAVIER>,I<CONFIGURATION2_DU_CLAVIER> ... I<CONFIGURATIONn_DU_CLAVIER>"
#. type: Plain text
#: en/live-config.7:51
@@ -829,7 +829,7 @@ msgstr ""
#: en/live-config.7:132
#, no-wrap
msgid "CUSTOMIZATION"
-msgstr "CUSTOMIZATION"
+msgstr "CUSTOMISATION"
#. type: Plain text
#: en/live-config.7:134
@@ -884,6 +884,13 @@ msgid ""
"scripts through the boot parameter, a configuration file should be used, see "
"above."
msgstr ""
+"Il n'est pas encore vraiment possible d'enlever sans problème les scripts "
+"sans avoir besoin de charger un paquet B<live-config> modifié localement. "
+"Cependant, on peut réaliser une chose similaire en désactivant les scripts "
+"respectifs via le mécanisme live-noconfig, comme indiqué ci-dessus. Afin "
+"d'éviter d'avoir à spécifier les scripts désactivés en passant par le "
+"paramètre de lancement, vous devriez utiliser un fichier de configuration, "
+"voir ci-dessus."
#. type: Plain text
#: en/live-config.7:144
diff --git a/manpages/po/pt_BR/live-config.7.po b/manpages/po/pt_BR/live-config.7.po
index e6cbb1e..e158894 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~a17\n"
-"POT-Creation-Date: 2010-07-29 16:55+0300\n"
+"Project-Id-Version: live-config 2.0.0\n"
+"POT-Creation-Date: 2010-08-10 00:00+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"
@@ -23,15 +23,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-07-29"
-msgstr "29-07-2010"
+msgid "2010-08-10"
+msgstr "10-08-2010"
#. type: TH
#: en/live-config.7:9
-#, fuzzy, no-wrap
-#| msgid "2.0~a16"
-msgid "2.0~a17"
-msgstr "2.0~a16"
+#, no-wrap
+msgid "2.0.0"
+msgstr ""
#. type: TH
#: en/live-config.7:9
@@ -95,7 +94,7 @@ msgstr "Parâmetros de Inicialização (scripts)"
#: en/live-config.7:22
msgid ""
"B<live-config> is only activated if 'boot=live' is used as a boot parameter. "
-"Additionally, B<live-config> needs to be told which scripts to run trough "
+"Additionally, B<live-config> needs to be told which scripts to run through "
"the 'live-config' parameter or which scripts to not run through the 'live-"
"noconfig' parameter. If both 'live-config' and 'live-noconfig' are used, or, "
"if either one is specified multiple times, always the later one takes "
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index b9451a6..99ba064 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-07-29 16:55+0300\n"
+"POT-Creation-Date: 2010-08-10 00:00+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"
@@ -24,13 +24,13 @@ msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-07-29"
+msgid "2010-08-10"
msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0~a17"
+msgid "2.0.0"
msgstr ""
#. type: TH
@@ -88,7 +88,7 @@ msgstr ""
#: en/live-config.7:22
msgid ""
"B<live-config> is only activated if 'boot=live' is used as a boot parameter. "
-"Additionally, B<live-config> needs to be told which scripts to run trough "
+"Additionally, B<live-config> needs to be told which scripts to run through "
"the 'live-config' parameter or which scripts to not run through the 'live-"
"noconfig' parameter. If both 'live-config' and 'live-noconfig' are used, or, "
"if either one is specified multiple times, always the later one takes "
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index 88a8120..174967b 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 29\-07\-2010 2.0~a17 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 10\-08\-2010 2.0.0 "Projeto Debian Live"
.SH NOME
\fBlive\-config\fP \- Scripts para Configuração do Sistema
--
live-config
More information about the debian-live-changes
mailing list