[SCM] live-config branch, upstream, updated. upstream/2.0.6-1-g47fff8f
Daniel Baumann
daniel at debian.org
Sun Sep 26 07:03:21 UTC 2010
The following commit has been merged in the upstream branch:
commit 47fff8f88949bc6b2b88ac33b71c34272e4eb252
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Sep 26 09:02:24 2010 +0200
Adding upstream version 2.0.7.
diff --git a/VERSION b/VERSION
index 157e54f..f1547e6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.6
+2.0.7
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 30bb8db..ad42b5e 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 15.09.2010 2.0.6 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 26.09.2010 2.0.7 "Debian Live Projekt"
.SH NAME
\fBlive\-config\fP \- System Konfiguration Skripte
@@ -35,19 +35,19 @@ oder mit dem Parameter 'live\-noconfig', welche Skripte nicht ausgeführt
werden sollen. Werden beide beide Parameter oder mehrmals benützt, so geht
der in der Reihenfolge lezte allen vorhergehenden vor.
-.IP \fBlive\-config\fP 4
+.IP "\fBlive\-config\fP | \fBconfig\fP" 4
Alle Skripte werden ausgeführt. Auf Debian Live Images ist dies das
Standardverhalten.
-.IP "\fBlive\-config\fP=\fISKRIPT1\fP,\fISKRIPT2\fP, ... \fISKRIPTn\fP" 4
+.IP "\fBlive\-config\fP=\fISKRIPT1\fP,\fISKRIPT2\fP, ... \fISKRIPTn\fP | \fBconfig\fP=\fISKRIPT1\fP,\fISKRIPT2\fP, ... \fISKRIPTn\fP" 4
Nur angegebene Skripte werden ausgeführt. Die Reihenfolge ist wesentlich,
d.h. 'live\-config=sudo,user\-setup' würde nicht funktionieren da der Benutzer
zuerst angelegt werden muss bevor für ihn sudo konfiguriert werden
kann. Siehe Dateinamen der Skripte in /lib/live/config für ihre
Ordnungsnummer.
-.IP \fBlive\-noconfig\fP 4
+.IP "\fBlive\-noconfig\fP | \fBnoconfig\fP" 4
Kein Skript wird ausgeführt. Dies ist das Gleiche, wie wenn weder
\&'live\-config' noch 'live\-noconfig' verwendet wird.
-.IP "\fBlive\-noconfig\fP=\fISKRIPT1\fP,\fISKRIPT2\fP, ... \fISKRIPTn\fP" 4
+.IP "\fBlive\-noconfig\fP=\fISKRIPT1\fP,\fISKRIPT2\fP, ... \fISKRIPTn\fP | \fBnoconfig\fP=\fISKRIPT1\fP,\fISKRIPT2\fP, ... \fISKRIPTn\fP" 4
Alle Skripte werden ausgeführt, ausser die hier spezifizierten Ausnahmen.
.SS "Boot Parameter (Optionen)"
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index a6578aa..a9614d0 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\-15 2.0.6 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2010\-09\-26 2.0.7 "Debian Live Project"
.SH NAME
\fBlive\-config\fR \- System Configuration Scripts
@@ -20,13 +20,13 @@
.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 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
+.IP "\fBlive\-config\fR | \fBconfig\fR" 4
All scripts are run. This is what Debian Live images use by default.
-.IP "\fBlive\-config\fR=\fISCRIPT1\fR,\fISCRIPT2\fR, ... \fISCRIPTn\fR" 4
+.IP "\fBlive\-config\fR=\fISCRIPT1\fR,\fISCRIPT2\fR, ... \fISCRIPTn\fR | \fBconfig\fR=\fISCRIPT1\fR,\fISCRIPT2\fR, ... \fISCRIPTn\fR" 4
Only the specified scripts are run. Note that the order matters, e.g. 'live\-config=sudo,user\-setup' would not work since the user needs to be added before it can be configured for sudo. Look at the filenames of the scripts in /lib/live/config for their ordering number.
-.IP "\fBlive\-noconfig\fR" 4
+.IP "\fBlive\-noconfig\fR | \fBnoconfig\fR" 4
No script is run. This is the same as not using any of 'live\-config' or 'live\-noconfig'.
-.IP "\fBlive\-noconfig\fR=\fISCRIPT1\fR,\fISCRIPT2\fR, ... \fISCRIPTn\fR" 4
+.IP "\fBlive\-noconfig\fR=\fISCRIPT1\fR,\fISCRIPT2\fR, ... \fISCRIPTn\fR | \fBnoconfig\fR=\fISCRIPT1\fR,\fISCRIPT2\fR, ... \fISCRIPTn\fR" 4
All scripts are run, except the specified ones.
.SS Boot Parameters (options)
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index 7ec4a60..866ec1a 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 15.09.2010 2.0.6 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 26.09.2010 2.0.7 "Projet Debian Live"
.SH NOM
\fBlive\-config\fP \- Scripts de configuration du système
@@ -36,18 +36,18 @@ ceux qui ne doivent pas être lancés via en utilisant le paramètre
l'un d'eux est spécifié plusieurs fois, c'est toujours le dernier qui a la
préséance sur ceux qui précèdent.
-.IP \fBlive\-config\fP 4
+.IP "\fBlive\-config\fP | \fBconfig\fP" 4
Tous les scripts sont lancés. C'est la configuration par défaut des images
Debian Live.
-.IP "\fBlive\-config\fP=\fISCRIPT1\fP,\fISCRIPT2\fP, ... \fISCRIPTn\fP" 4
+.IP "\fBlive\-config\fP=\fISCRIPT1\fP,\fISCRIPT2\fP, ... \fISCRIPTn\fP | \fBconfig\fP=\fISCRIPT1\fP,\fISCRIPT2\fP, ... \fISCRIPTn\fP" 4
Seuls les scripts spécifiés sont lancés. Notez que leur ordre importe,
\-ainsi 'live\-config=sudo,user\-setup' ne peut pas fonctionner tant que
l'utilisateur configuré pour utiliser sudo n'a pas été créé. Regardez les
noms des scripts dans /lib/live/config pour les ordonner numériquement.
-.IP \fBlive\-noconfig\fP 4
+.IP "\fBlive\-noconfig\fP | \fBnoconfig\fP" 4
Aucun script n'est lancé. Celà revient au même que de n'utiliser ni
\&'live\-config' ni 'live\-noconfig'.
-.IP "\fBlive\-noconfig\fP=\fISCRIPT1\fP,\fISCRIPT2\fP, ... \fISCRIPTn\fP" 4
+.IP "\fBlive\-noconfig\fP=\fISCRIPT1\fP,\fISCRIPT2\fP, ... \fISCRIPTn\fP | \fBnoconfig\fP=\fISCRIPT1\fP,\fISCRIPT2\fP, ... \fISCRIPTn\fP" 4
Tous les scripts sont lancés, à l'exception de ceux spécifiés.
.SS "Paramètres d'amorçage (options)"
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index 946bd44..3125c7f 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 2.0.6\n"
-"POT-Creation-Date: 2010-09-15 12:06+0300\n"
+"POT-Creation-Date: 2010-09-26 09: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-09-15"
-msgstr "15.09.2010"
+msgid "2010-09-26"
+msgstr "26.09.2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.6"
-msgstr "2.0.6"
+msgid "2.0.7"
+msgstr "2.0.7"
#. type: TH
#: en/live-config.7:9
@@ -111,8 +111,8 @@ msgstr ""
#. type: IP
#: en/live-config.7:23
#, no-wrap
-msgid "B<live-config>"
-msgstr "B<live-config>"
+msgid "B<live-config> | B<config>"
+msgstr "B<live-config> | B<config>"
#. type: Plain text
#: en/live-config.7:25
@@ -124,8 +124,8 @@ msgstr ""
#. type: IP
#: en/live-config.7:25
#, no-wrap
-msgid "B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
-msgstr "B<live-config>=I<SKRIPT1>,I<SKRIPT2>, ... I<SKRIPTn>"
+msgid "B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn> | B<config>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
+msgstr "B<live-config>=I<SKRIPT1>,I<SKRIPT2>, ... I<SKRIPTn> | B<config>=I<SKRIPT1>,I<SKRIPT2>, ... I<SKRIPTn>"
#. type: Plain text
#: en/live-config.7:27
@@ -143,8 +143,8 @@ msgstr ""
#. type: IP
#: en/live-config.7:27
#, no-wrap
-msgid "B<live-noconfig>"
-msgstr "B<live-noconfig>"
+msgid "B<live-noconfig> | B<noconfig>"
+msgstr "B<live-noconfig> | B<noconfig>"
#. type: Plain text
#: en/live-config.7:29
@@ -158,8 +158,8 @@ msgstr ""
#. type: IP
#: en/live-config.7:29
#, no-wrap
-msgid "B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
-msgstr "B<live-noconfig>=I<SKRIPT1>,I<SKRIPT2>, ... I<SKRIPTn>"
+msgid "B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn> | B<noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
+msgstr "B<live-noconfig>=I<SKRIPT1>,I<SKRIPT2>, ... I<SKRIPTn> | B<noconfig>=I<SKRIPT1>,I<SKRIPT2>, ... I<SKRIPTn>"
#. type: Plain text
#: en/live-config.7:31
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index f715803..cc8dd52 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 2.0.6\n"
-"POT-Creation-Date: 2010-09-15 12:06+0300\n"
+"POT-Creation-Date: 2010-09-26 09: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-09-15"
-msgstr "15.09.2010"
+msgid "2010-09-26"
+msgstr "26.09.2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.6"
-msgstr "2.0.6"
+msgid "2.0.7"
+msgstr "2.0.7"
#. type: TH
#: en/live-config.7:9
@@ -112,8 +112,8 @@ msgstr ""
#. type: IP
#: en/live-config.7:23
#, no-wrap
-msgid "B<live-config>"
-msgstr "B<live-config>"
+msgid "B<live-config> | B<config>"
+msgstr "B<live-config> | B<config>"
#. type: Plain text
#: en/live-config.7:25
@@ -125,8 +125,8 @@ msgstr ""
#. type: IP
#: en/live-config.7:25
#, no-wrap
-msgid "B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
-msgstr "B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
+msgid "B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn> | B<config>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
+msgstr "B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn> | B<config>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
#. type: Plain text
#: en/live-config.7:27
@@ -144,8 +144,8 @@ msgstr ""
#. type: IP
#: en/live-config.7:27
#, no-wrap
-msgid "B<live-noconfig>"
-msgstr "B<live-noconfig>"
+msgid "B<live-noconfig> | B<noconfig>"
+msgstr "B<live-noconfig> | B<noconfig>"
#. type: Plain text
#: en/live-config.7:29
@@ -159,8 +159,8 @@ msgstr ""
#. type: IP
#: en/live-config.7:29
#, no-wrap
-msgid "B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
-msgstr "B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
+msgid "B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn> | B<noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
+msgstr "B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn> | B<noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
#. type: Plain text
#: en/live-config.7:31
diff --git a/manpages/po/pt_BR/live-config.7.po b/manpages/po/pt_BR/live-config.7.po
index 86d123e..e68ed7c 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 2.0.6\n"
-"POT-Creation-Date: 2010-09-15 12:06+0300\n"
+"POT-Creation-Date: 2010-09-26 09: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,14 +23,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-09-15"
-msgstr "15-09-2010"
+msgid "2010-09-26"
+msgstr "26-09-2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.6"
-msgstr "2.0.6"
+msgid "2.0.7"
+msgstr "2.0.7"
#. type: TH
#: en/live-config.7:9
@@ -110,8 +110,8 @@ msgstr ""
#. type: IP
#: en/live-config.7:23
#, no-wrap
-msgid "B<live-config>"
-msgstr "B<live-config>"
+msgid "B<live-config> | B<config>"
+msgstr "B<live-config> | B<config>"
#. type: Plain text
#: en/live-config.7:25
@@ -123,8 +123,8 @@ msgstr ""
#. type: IP
#: en/live-config.7:25
#, no-wrap
-msgid "B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
-msgstr "B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
+msgid "B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn> | B<config>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
+msgstr "B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn> | B<config>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
#. type: Plain text
#: en/live-config.7:27
@@ -142,8 +142,8 @@ msgstr ""
#. type: IP
#: en/live-config.7:27
#, no-wrap
-msgid "B<live-noconfig>"
-msgstr "B<live-noconfig>"
+msgid "B<live-noconfig> | B<noconfig>"
+msgstr "B<live-noconfig> | B<noconfig>"
#. type: Plain text
#: en/live-config.7:29
@@ -157,8 +157,8 @@ msgstr ""
#. type: IP
#: en/live-config.7:29
#, no-wrap
-msgid "B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
-msgstr "B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
+msgid "B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn> | B<noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
+msgstr "B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn> | B<noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
#. type: Plain text
#: en/live-config.7:31
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 313dcb4..618027d 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-15 12:06+0300\n"
+"POT-Creation-Date: 2010-09-26 09: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"
@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-09-15"
+msgid "2010-09-26"
msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.6"
+msgid "2.0.7"
msgstr ""
#. type: TH
@@ -99,7 +99,7 @@ msgstr ""
#. type: IP
#: en/live-config.7:23
#, no-wrap
-msgid "B<live-config>"
+msgid "B<live-config> | B<config>"
msgstr ""
#. type: Plain text
@@ -110,7 +110,7 @@ msgstr ""
#. type: IP
#: en/live-config.7:25
#, no-wrap
-msgid "B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
+msgid "B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn> | B<config>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
msgstr ""
#. type: Plain text
@@ -125,7 +125,7 @@ msgstr ""
#. type: IP
#: en/live-config.7:27
#, no-wrap
-msgid "B<live-noconfig>"
+msgid "B<live-noconfig> | B<noconfig>"
msgstr ""
#. type: Plain text
@@ -138,7 +138,7 @@ msgstr ""
#. type: IP
#: en/live-config.7:29
#, no-wrap
-msgid "B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
+msgid "B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn> | B<noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
msgstr ""
#. type: Plain text
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index 34a9ca4..0bdcac4 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 15\-09\-2010 2.0.6 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 26\-09\-2010 2.0.7 "Projeto Debian Live"
.SH NOME
\fBlive\-config\fP \- Scripts para Configuração do Sistema
@@ -35,18 +35,18 @@ não executar, através do parâmetro 'live\-noconfig'. Se ambos 'live\-config'
\&'live\-noconfig' forem usados, ou um deles for especificado múltiplas vezes,
o último sempre assume precedência sobre o(s) anterior(es).
-.IP \fBlive\-config\fP 4
+.IP "\fBlive\-config\fP | \fBconfig\fP" 4
Todos os scripts são executados. Isto é o que as imagens do Debian Live usam
por padrão.
-.IP "\fBlive\-config\fP=\fISCRIPT1\fP,\fISCRIPT2\fP, ... \fISCRIPTn\fP" 4
+.IP "\fBlive\-config\fP=\fISCRIPT1\fP,\fISCRIPT2\fP, ... \fISCRIPTn\fP | \fBconfig\fP=\fISCRIPT1\fP,\fISCRIPT2\fP, ... \fISCRIPTn\fP" 4
Apenas os scripts especificados são executados. Note que a ordem dos scripts
é relevante, por exemplo, 'live\-config=sudo,user\-setup' não funcionaria pois
o usuário precisa ser criado antes de ser configurado para sudo. A ordem dos
scripts pelos nomes dos arquivos está definida em /lib/live/config.
-.IP \fBlive\-noconfig\fP 4
+.IP "\fBlive\-noconfig\fP | \fBnoconfig\fP" 4
Nenhum script é executado. É o mesmo que não usar 'live\-config' nem
\&'live\-noconfig'.
-.IP "\fBlive\-noconfig\fP=\fISCRIPT1\fP,\fISCRIPT2\fP, ... \fISCRIPTn\fP" 4
+.IP "\fBlive\-noconfig\fP=\fISCRIPT1\fP,\fISCRIPT2\fP, ... \fISCRIPTn\fP | \fBnoconfig\fP=\fISCRIPT1\fP,\fISCRIPT2\fP, ... \fISCRIPTn\fP" 4
Todos os scripts são executados, exceto os especificados.
.SS "Parâmetros de inicialização (opções)"
diff --git a/scripts/config.sh b/scripts/config.sh
index 9e9c030..eac0cab 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -32,25 +32,25 @@ Cmdline ()
for _PARAMETER in $(cat /proc/cmdline)
do
case "${_PARAMETER}" in
- live-config)
+ live-config|config)
# Run all scripts
_SCRIPTS="$(ls /lib/live/config/*)"
;;
live-config=*)
# Only run requested scripts
- LIVE_CONFIGS="${_PARAMETER#live-config=}"
+ LIVE_CONFIGS="${_PARAMETER#*config=}"
;;
- live-noconfig)
+ live-noconfig|noconfig)
# Don't run any script
_SCRIPTS=""
;;
- live-noconfig=*)
+ live-noconfig=*|noconfig=*)
# Don't run requested scripts
_SCRIPTS="$(ls /lib/live/config/*)"
- LIVE_NOCONFIGS="${_PARAMETER#live-noconfig=}"
+ LIVE_NOCONFIGS="${_PARAMETER#*noconfig=}"
;;
# 001-hostname
diff --git a/scripts/config/002-user-setup b/scripts/config/002-user-setup
index 7e0fd63..867040b 100755
--- a/scripts/config/002-user-setup
+++ b/scripts/config/002-user-setup
@@ -41,7 +41,7 @@ user-setup passwd/root-password-crypted string *
user-setup passwd/user-password-crypted string ${_PASSWORD}
user-setup passwd/user-fullname string ${LIVE_USER_FULLNAME}
user-setup passwd/username string ${LIVE_USERNAME}
-user-setup passwd/user-uid string 999
+user-setup passwd/user-uid string 1000
EOF
debconf-set-selections < /tmp/debconf.live
diff --git a/scripts/config/013-console-common b/scripts/config/013-console-common
index 5748d4f..51b1eef 100755
--- a/scripts/config/013-console-common
+++ b/scripts/config/013-console-common
@@ -12,7 +12,7 @@ Console_common ()
{
# Checking if package is installed or already configured
if [ ! -e /var/lib/dpkg/info/console-common.list ] || \
- [ -e /var/lib/live/config/console-common.list ]
+ [ -e /var/lib/live/config/console-common ]
then
return
fi
diff --git a/scripts/config/101-apport b/scripts/config/101-apport
index 60ac506..c6c1ce6 100755
--- a/scripts/config/101-apport
+++ b/scripts/config/101-apport
@@ -12,7 +12,7 @@ Apport ()
{
# Checking if package is installed or already configured
if [ ! -e /var/lib/dpkg/info/apport.list ] || \
- [ -e /var/lib/live/apport ]
+ [ -e /var/lib/live/config/apport ]
then
return
fi
diff --git a/scripts/config/118-ureadahead b/scripts/config/118-ureadahead
index 6415e93..ece77bb 100755
--- a/scripts/config/118-ureadahead
+++ b/scripts/config/118-ureadahead
@@ -12,7 +12,7 @@ Ureadahead ()
{
# Checking if package is installed or already configured
if [ ! -e /var/lib/dpkg/info/ureadahead.list ] || \
- [ -e /var/lib/live/ureadahead ]
+ [ -e /var/lib/live/config/ureadahead ]
then
return
fi
--
live-config
More information about the debian-live-changes
mailing list