[SCM] live-config branch, debian, updated. debian/2.0_a14-1-16-gd485a6f
Daniel Baumann
daniel at debian.org
Fri Jul 16 23:18:48 UTC 2010
The following commit has been merged in the debian branch:
commit d24503dc12f7a458e05eb919561c6dd21ccf53be
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Jul 16 21:54:54 2010 +0200
Allowing to combine different hook methods at the same time.
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 8e10aff..41bb781 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -112,6 +112,10 @@ mit der Option 'filesystem' automatisch aktiviert werden.
.br
Alle Dateien in /live/hooks/ auf dem Live Medium können mit der Option
\&'medium' automatisch aktiviert werden.
+.br
+Werden verschiedene Mechanismen kombiniert, so werden die Dateisystem Hooks
+zuerst ausgeführt, dann die des Mediums und zuletzt die sich im Netzwerk
+befindende.
.SS "Boot Parameter (Abkürzungen)"
\fBlive\-config\fP stellt Abkürzungen für einige häufige verwendete
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index b2e5f4e..ebc87a3 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -66,6 +66,8 @@ If the file is placed on the live medium, it can be fetched with file:///live/im
All hooks in /lib/live/hooks/ in the root filesystem of the live system can be automatically be enabled with the keyword 'filesystem'.
.br
All hooks in /live/hooks/ of the live medium can be automatically be enabled with the keyword 'medium'.
+.br
+If several mechanisms are combined, then filesystem hooks are executed first, then medium hooks, and last the network hooks.
.SS Boot Parameters (shortcuts)
For some common use cases where it would require to combine several individual parameters, \fBlive\-config\fR provides shortcuts. This allows both to have full granularity over all the options, as well keep things simple.
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index 5b5739f..22a32b9 100644
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -116,6 +116,9 @@ be automatically be enabled with the keyword 'filesystem'.
.br
All hooks in /live/hooks/ of the live medium can be automatically be enabled
with the keyword 'medium'.
+.br
+If several mechanisms are combined, then filesystem hooks are executed
+first, then medium hooks, and last the network hooks.
.SS "Paramètres d'amorçage (raccourcis)"
Dans le cas où il est nécessaire de combiner plusieurs paramètres
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index cefe628..3029d72 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~a14\n"
-"POT-Creation-Date: 2010-07-16 21:43+0300\n"
+"POT-Creation-Date: 2010-07-16 21:53+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"
@@ -416,14 +416,24 @@ msgstr ""
"Alle Dateien in /live/hooks/ auf dem Live Medium können mit der Option "
"'medium' automatisch aktiviert werden."
+#. type: Plain text
+#: en/live-config.7:71
+msgid ""
+"If several mechanisms are combined, then filesystem hooks are executed "
+"first, then medium hooks, and last the network hooks."
+msgstr ""
+"Werden verschiedene Mechanismen kombiniert, so werden die Dateisystem Hooks "
+"zuerst ausgeführt, dann die des Mediums und zuletzt die sich im Netzwerk "
+"befindende."
+
#. type: SS
-#: en/live-config.7:70
+#: en/live-config.7:72
#, no-wrap
msgid "Boot Parameters (shortcuts)"
msgstr "Boot Parameter (Abkürzungen)"
#. type: Plain text
-#: en/live-config.7:72
+#: en/live-config.7:74
msgid ""
"For some common use cases where it would require to combine several "
"individual parameters, B<live-config> provides shortcuts. This allows both "
@@ -435,13 +445,13 @@ msgstr ""
"einfache Benutzbarkeit."
#. type: IP
-#: en/live-config.7:73
+#: en/live-config.7:75
#, no-wrap
msgid "B<live-config.noroot> | B<noroot>"
msgstr "B<live-config.noroot> | B<noroot>"
#. type: Plain text
-#: en/live-config.7:75
+#: en/live-config.7:77
msgid ""
"Disables the sudo and policykit, the user cannot gain root privileges on the "
"system."
@@ -450,26 +460,26 @@ msgstr ""
"Privilegien auf dem System mehr erlangen."
#. type: IP
-#: en/live-config.7:75
+#: en/live-config.7:77
#, no-wrap
msgid "B<live-config.noautologin> | B<noautologin>"
msgstr "B<live-config.nottyautologin> | B<noautologin>"
#. type: Plain text
-#: en/live-config.7:77
+#: en/live-config.7:79
msgid "Disables both the automatic console login and the graphical autologin."
msgstr ""
"Schaltet sowohl den den automatischen Login via TTY ab als auch den "
"automatischen graphischen Login."
#. type: IP
-#: en/live-config.7:77
+#: en/live-config.7:79
#, no-wrap
msgid "B<live-config.nottyautologin> | B<nottyautologin>"
msgstr "B<live-config.nottyautologin> | B<nottyautologin>"
#. type: Plain text
-#: en/live-config.7:79
+#: en/live-config.7:81
msgid ""
"Disables the automatic login on the console, not affecting the graphical "
"autologin."
@@ -478,13 +488,13 @@ msgstr ""
"automatisch graphischen Login nicht."
#. type: IP
-#: en/live-config.7:79
+#: en/live-config.7:81
#, no-wrap
msgid "B<live-config.nox11autologin> | B<nox11autologin>"
msgstr "B<live-config.nox11autologin> | B<nox11autologin>"
#. type: Plain text
-#: en/live-config.7:81
+#: en/live-config.7:83
msgid ""
"Disables the automatic login with any display manager, not affecting tty "
"autologin."
@@ -493,36 +503,36 @@ msgstr ""
"den automatischen tty Login nicht."
#. type: SS
-#: en/live-config.7:82
+#: en/live-config.7:84
#, no-wrap
msgid "Boot Parameters (special options)"
msgstr "Boot Parameter (Spezielle Optionen)"
#. type: Plain text
-#: en/live-config.7:84
+#: en/live-config.7:86
msgid "For special use cases there are some special boot paramters."
msgstr ""
"Für spezielle Anwendungsfälle gibt es ein paar spezielle Bootparameter."
#. type: IP
-#: en/live-config.7:85
+#: en/live-config.7:87
#, no-wrap
msgid "B<live-config.debug> | B<debug>"
msgstr "B<live-config.debug> | B<debug>"
#. type: Plain text
-#: en/live-config.7:87
+#: en/live-config.7:89
msgid "Enables debug output in live-config."
msgstr "Schaltet debug Ausgaben in live-config an."
#. type: SS
-#: en/live-config.7:88
+#: en/live-config.7:90
#, no-wrap
msgid "Configuration Files"
msgstr "Konfigurationsdateien"
#. type: Plain text
-#: en/live-config.7:90
+#: en/live-config.7:92
msgid ""
"B<live-config> can be configured (but not activated) through configuration "
"files. Everything but the shortcuts that can be configured with a boot "
@@ -538,7 +548,7 @@ msgstr ""
"aktivieren."
#. type: Plain text
-#: en/live-config.7:92
+#: en/live-config.7:94
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/"
@@ -553,7 +563,7 @@ msgstr ""
"Live Medium dem der im Root Dateisystem enthaltenen vor."
#. type: Plain text
-#: en/live-config.7:94
+#: en/live-config.7:96
msgid ""
"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 "
@@ -569,13 +579,13 @@ msgstr ""
"'debian-eeepc.conf')."
#. type: IP
-#: en/live-config.7:95
+#: en/live-config.7:97
#, no-wrap
msgid "B<LIVE_CONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
msgstr "B<LIVE_CONFIGS>=I<SKRIPT1>,I<SKRIPT2>, ... I<SKRIPTn>"
#. type: Plain text
-#: en/live-config.7:97
+#: en/live-config.7:99
msgid ""
"This variable equals the 'B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
@@ -584,13 +594,13 @@ msgstr ""
"I<SKRIPTn>' Parameter."
#. type: IP
-#: en/live-config.7:97
+#: en/live-config.7:99
#, no-wrap
msgid "B<LIVE_NOCONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
msgstr "B<LIVE_NOCONFIGS>=I<SKRIPT1>,I<SKRIPT2>, ... I<SKRIPTn>"
#. type: Plain text
-#: en/live-config.7:99
+#: en/live-config.7:101
msgid ""
"This variable equals the 'B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
@@ -599,13 +609,13 @@ msgstr ""
"I<SKRIPTn>' Parameter."
#. type: IP
-#: en/live-config.7:99
+#: en/live-config.7:101
#, no-wrap
msgid "B<LIVE_HOSTNAME>=I<HOSTNAME>"
msgstr "B<LIVE_HOSTNAME>=I<RECHNERNAME>"
#. type: Plain text
-#: en/live-config.7:101
+#: en/live-config.7:103
msgid ""
"This variable equals the 'B<live-config.hostname>=I<HOSTAME>' parameter."
msgstr ""
@@ -613,13 +623,13 @@ msgstr ""
"Parameter."
#. type: IP
-#: en/live-config.7:101
+#: en/live-config.7:103
#, no-wrap
msgid "B<LIVE_USERNAME>=I<USERNAME>"
msgstr "B<LIVE_USERNAME>=I<BENUTZERNAME>"
#. type: Plain text
-#: en/live-config.7:103
+#: en/live-config.7:105
msgid ""
"This variable equals the 'B<live-config.username>=I<USERNAME>' parameter."
msgstr ""
@@ -627,13 +637,13 @@ msgstr ""
"Parameter."
#. type: IP
-#: en/live-config.7:103
+#: en/live-config.7:105
#, no-wrap
msgid "B<LIVE_USER_FULLNAME>=\"I<USER FULLNAME\">"
msgstr "B<LIVE_USER_FULLNAME>=\"I<VOLLER BENUTZERNAME\">"
#. type: Plain text
-#: en/live-config.7:105
+#: en/live-config.7:107
msgid ""
"This variable equals the 'B<live-config.user-fullname>=\"I<USER FULLNAME>\"' "
"parameter."
@@ -642,13 +652,13 @@ msgstr ""
"BENUTZERNAME>\"' Parameter."
#. type: IP
-#: en/live-config.7:105
+#: en/live-config.7:107
#, no-wrap
msgid "B<LIVE_LOCALES>=I<LOCALE1>,I<LOCALE2> ... I<LOCALEn>"
msgstr "B<LIVE_LOCALES>=I<GEBIETSSCHEMA1>,I<GEBIETSSCHEMA2> ... I<GEBIETSSCHEMAn>"
#. type: Plain text
-#: en/live-config.7:107
+#: en/live-config.7:109
msgid ""
"This variable equals the 'B<live-config.locales>=I<LOCALE1>,I<LOCALE2> ... "
"I<LOCALEn>' parameter."
@@ -657,37 +667,37 @@ msgstr ""
"I<GEBIETSSCHEMA2> ... I<GEBIETSSCHEMAn>' Parameter."
#. type: IP
-#: en/live-config.7:107
+#: en/live-config.7:109
#, no-wrap
msgid "B<LIVE_TIMEZONE>=I<TIMEZONE>"
msgstr "B<LIVE_TIMEZONE>=I<ZEITZONE>"
#. type: Plain text
-#: en/live-config.7:109
+#: en/live-config.7:111
msgid ""
"This variable equals the 'B<live-config.timezone>=I<TIMEZONE>' parameter."
msgstr ""
"Diese Variable enspricht dem 'B<live-config.timezone>=I<ZEITZONE>' Parameter."
#. type: IP
-#: en/live-config.7:109
+#: en/live-config.7:111
#, no-wrap
msgid "B<LIVE_UTC>=B<yes>|no"
msgstr "B<LIVE_UTC>=B<yes>|no"
#. type: Plain text
-#: en/live-config.7:111
+#: en/live-config.7:113
msgid "This variable equals the 'B<live-config.utc>=B<yes>|no' parameter."
msgstr "Diese Variable enspricht dem 'B<live-config.utc>=B<yes>|no' Parameter."
#. type: IP
-#: en/live-config.7:111
+#: en/live-config.7:113
#, no-wrap
msgid "B<LIVE_KEYBOARD_MODEL>=I<KEYBOARD_MODEL>"
msgstr "B<LIVE_KEYBOARD_MODEL>=I<TASTATUR_MODELL>"
#. type: Plain text
-#: en/live-config.7:113
+#: en/live-config.7:115
msgid ""
"This variable equals the 'B<live-config.keyboard-model>=I<KEYBOARD_MODEL>' "
"parameter."
@@ -696,13 +706,13 @@ msgstr ""
"model>=I<TASTATUR_MODELL>' Parameter."
#. type: IP
-#: en/live-config.7:113
+#: en/live-config.7:115
#, no-wrap
msgid "B<LIVE_KEYBOARD_LAYOUTS>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>"
msgstr "B<LIVE_KEYBOARD_LAYOUTS>=I<TASTATUR_LAYOUT1>,I<TASTATUR_LAYOUT2> ... I<TASTATUR_LAYOUTn>"
#. type: Plain text
-#: en/live-config.7:115
+#: en/live-config.7:117
msgid ""
"This variable equals the 'B<live-config.keyboard-"
"layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>' "
@@ -713,13 +723,13 @@ msgstr ""
"Parameter."
#. type: IP
-#: en/live-config.7:115
+#: en/live-config.7:117
#, no-wrap
msgid "B<LIVE_KEYBOARD_VARIANT>=I<KEYBOARD_VARIANT>"
msgstr "B<LIVE_KEYBOARD_VARIANT>=I<TASTATUR_VARIANTE>"
#. type: Plain text
-#: en/live-config.7:117
+#: en/live-config.7:119
msgid ""
"This variable equals the 'B<live-config.keyboard-"
"variant>=I<KEYBOARD_VARIANT>' parameter."
@@ -728,13 +738,13 @@ msgstr ""
"variant>=I<TASTATUR_VARIANTE>' Parameter."
#. type: IP
-#: en/live-config.7:117
+#: en/live-config.7:119
#, no-wrap
msgid "B<LIVE_KEYBOARD_OPTIONS>=I<KEYBOARD_OPTIONS>"
msgstr "B<LIVE_KEYBOARD_OPTIONS>=I<TASTATUR_OPTIONEN>"
#. type: Plain text
-#: en/live-config.7:119
+#: en/live-config.7:121
msgid ""
"This variable equals the 'B<live-config.keyboard-"
"options>=I<KEYBOARD_OPTIONS>' parameter."
@@ -743,13 +753,13 @@ msgstr ""
"options>=I<TASTATUR_OPTIONEN>' Parameter."
#. type: IP
-#: en/live-config.7:119
+#: en/live-config.7:121
#, no-wrap
msgid "B<LIVE_SYSV_RC>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn>"
msgstr "B<LIVE_SYSV_RC>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn>"
#. type: Plain text
-#: en/live-config.7:121
+#: en/live-config.7:123
msgid ""
"This variable equals the 'B<live-config.sysv-rc>=I<SERVICE1>,I<SERVICE2> ... "
"I<SERVICEn>' parameter."
@@ -758,13 +768,13 @@ msgstr ""
"I<SERVICE2> ... I<SERVICEn>' Parameter."
#. type: IP
-#: en/live-config.7:121
+#: en/live-config.7:123
#, no-wrap
msgid "B<LIVE_XORG_DRIVER>=I<XORG_DRIVER>"
msgstr "B<LIVE_XORG_DRIVER>=I<XORG_TREIBER>"
#. type: Plain text
-#: en/live-config.7:123
+#: en/live-config.7:125
msgid ""
"This variable equals the 'B<live-config.xorg-driver>=I<XORG_DRIVER>' "
"parameter."
@@ -773,13 +783,13 @@ msgstr ""
"Parameter."
#. type: IP
-#: en/live-config.7:123
+#: en/live-config.7:125
#, no-wrap
msgid "B<LIVE_XORG_RESOLUTION>=I<XORG_RESOLUTION>"
msgstr "B<LIVE_XORG_RESOLUTION>=I<XORG_AUFLÖSUNG>"
#. type: Plain text
-#: en/live-config.7:125
+#: en/live-config.7:127
msgid ""
"This variable equals the 'B<live-config.xorg-resolution>=I<XORG_RESOLUTION>' "
"parameter."
@@ -788,13 +798,13 @@ msgstr ""
"resolution>=I<XORG_AUFLÖSUNG>' Parameter."
#. type: IP
-#: en/live-config.7:125
+#: en/live-config.7:127
#, no-wrap
msgid "B<LIVE_HOOKS>=filesystem|medium|I<URL1>|I<URL2>| ... |I<URLn>"
msgstr "B<LIVE_HOOKS>=filesystem|medium|I<URL1>|I<URL2>| ... |I<URLn>"
#. type: Plain text
-#: en/live-config.7:127
+#: en/live-config.7:129
msgid ""
"This variable equals the 'B<live-config.hooks>=filesystem|medium|I<URL1>|"
"I<URL2>| ... |I<URLn>' parameter."
@@ -803,13 +813,13 @@ msgstr ""
"I<URL2>| ... |I<URLn>' Parameter."
#. type: SH
-#: en/live-config.7:128
+#: en/live-config.7:130
#, no-wrap
msgid "CUSTOMIZATION"
msgstr "ANPASSUNG"
#. type: Plain text
-#: en/live-config.7:130
+#: en/live-config.7:132
msgid ""
"B<live-config> can be easily customized for downstream projects or local "
"usage."
@@ -818,13 +828,13 @@ msgstr ""
"oder lokale Verwendung."
#. type: SS
-#: en/live-config.7:131
+#: en/live-config.7:133
#, no-wrap
msgid "Adding new config scripts"
msgstr "Hinzufügen von neuen Konfigurationsskripten"
#. type: Plain text
-#: en/live-config.7:133
+#: en/live-config.7:135
msgid ""
"Downstream projects can put their scripts into /lib/live/config and don't "
"need to do anything else, the scripts will be called automatically during "
@@ -835,7 +845,7 @@ msgstr ""
"Startens ausgeführt."
#. type: Plain text
-#: en/live-config.7:135
+#: en/live-config.7:137
msgid ""
"The scripts are best put into an own debian package. A sample package "
"containing an example script can be found in /usr/share/doc/live-config/"
@@ -846,13 +856,13 @@ msgstr ""
"examples."
#. type: SS
-#: en/live-config.7:136
+#: en/live-config.7:138
#, no-wrap
msgid "Removing existing config scripts"
msgstr "Entfernen von neuen Konfigurationsskripten"
#. type: Plain text
-#: en/live-config.7:138
+#: en/live-config.7:140
msgid ""
"It's not really possible to remove scripts itself in a sane way yet without "
"requiring to ship a locally modified B<live-config> package. However, the "
@@ -870,7 +880,7 @@ msgstr ""
"werden, siehe oben."
#. type: Plain text
-#: en/live-config.7:140
+#: en/live-config.7:142
msgid ""
"The configuration files for the live system itself are best put into an own "
"debian package. A sample package containing an example configuration can be "
@@ -881,235 +891,235 @@ msgstr ""
"konfigurationsdatei befindet sich in /usr/share/doc/live-config/examples."
#. type: SH
-#: en/live-config.7:141
+#: en/live-config.7:143
#, no-wrap
msgid "SCRIPTS"
msgstr "SKRIPTE"
#. type: Plain text
-#: en/live-config.7:143
+#: en/live-config.7:145
msgid ""
"B<live-config> currently features the following scripts in /lib/live/config."
msgstr "B<live-config> enthält derzeit folgende Skripte in /lib/live/config."
#. type: IP
-#: en/live-config.7:144
+#: en/live-config.7:146
#, no-wrap
msgid "B<hostname>"
msgstr "B<hostname>"
#. type: Plain text
-#: en/live-config.7:146
+#: en/live-config.7:148
msgid "configures /etc/hostname and /etc/hosts."
msgstr "konfiguriert /etc/hostname und /etc/hosts."
#. type: IP
-#: en/live-config.7:146
+#: en/live-config.7:148
#, no-wrap
msgid "B<user-setup>"
msgstr "B<user-setup>"
#. type: Plain text
-#: en/live-config.7:148
+#: en/live-config.7:150
msgid "adds an live user account."
msgstr "fügt das Live Benutzerkonto hinzu."
#. type: IP
-#: en/live-config.7:148
+#: en/live-config.7:150
#, no-wrap
msgid "B<sudo>"
msgstr "B<sudo>"
#. type: Plain text
-#: en/live-config.7:150
+#: en/live-config.7:152
msgid "grants sudo privileges to the live user."
msgstr "räumt dem Live Benutzer sudo Privilegien ein."
#. type: IP
-#: en/live-config.7:150
+#: en/live-config.7:152
#, no-wrap
msgid "B<locales>"
msgstr "B<locales>"
#. type: Plain text
-#: en/live-config.7:152
+#: en/live-config.7:154
msgid "configures locales."
msgstr "konfiguriert locales."
#. type: IP
-#: en/live-config.7:152
+#: en/live-config.7:154
#, no-wrap
msgid "B<tzdata>"
msgstr "B<tzdata>"
#. type: Plain text
-#: en/live-config.7:154
+#: en/live-config.7:156
msgid "configures /etc/timezone."
msgstr "konfiguriert /etc/timezone."
#. type: IP
-#: en/live-config.7:154
+#: en/live-config.7:156
#, no-wrap
msgid "B<gdm>"
msgstr "B<gdm>"
#. type: Plain text
-#: en/live-config.7:156
+#: en/live-config.7:158
msgid "configures autologin in gdm."
msgstr "konfiguriert Autologin in gdm."
#. type: IP
-#: en/live-config.7:156
+#: en/live-config.7:158
#, no-wrap
msgid "B<gdm3>"
msgstr "B<gdm3>"
#. type: Plain text
-#: en/live-config.7:158
+#: en/live-config.7:160
msgid "configures autologin in gdm3 (squeeze and newer)."
msgstr "konfiguriert Autologin in gdm3 (squeeze und neuer)."
#. type: IP
-#: en/live-config.7:158
+#: en/live-config.7:160
#, no-wrap
msgid "B<kdm>"
msgstr "B<kdm>"
#. type: Plain text
-#: en/live-config.7:160
+#: en/live-config.7:162
msgid "configures autologin in kdm."
msgstr "konfiguriert Autologin in kdm."
#. type: IP
-#: en/live-config.7:160
+#: en/live-config.7:162
#, no-wrap
msgid "B<lxdm>"
msgstr "B<lxdm>"
#. type: Plain text
-#: en/live-config.7:162
+#: en/live-config.7:164
msgid "configures autologin in lxdm."
msgstr "konfiguriert Autologin in lxdm."
#. type: IP
-#: en/live-config.7:162
+#: en/live-config.7:164
#, no-wrap
msgid "B<nodm>"
msgstr "B<nodm>"
#. type: Plain text
-#: en/live-config.7:164
+#: en/live-config.7:166
msgid "configures autologin in nodm."
msgstr "konfiguriert Autologin in nodm."
#. type: IP
-#: en/live-config.7:164
+#: en/live-config.7:166
#, no-wrap
msgid "B<slim>"
msgstr "B<slim>"
#. type: Plain text
-#: en/live-config.7:166
+#: en/live-config.7:168
msgid "configures autologin in slim."
msgstr "konfiguriert Autologin in slim."
#. type: IP
-#: en/live-config.7:166
+#: en/live-config.7:168
#, no-wrap
msgid "B<console-common>, B<console-setup> (lenny), B<keyboard-configuration> (squeeze and newer)"
msgstr "B<console-common>, B<console-setup> (lenny), B<keyboard-configuration> (squeeze und neuer)"
#. type: Plain text
-#: en/live-config.7:168
+#: en/live-config.7:170
msgid "configures the keyboard."
msgstr "konfiguriert die Tastatur."
#. type: IP
-#: en/live-config.7:168
+#: en/live-config.7:170
#, no-wrap
msgid "B<sysvinit>"
msgstr "B<sysvinit>"
#. type: Plain text
-#: en/live-config.7:170
+#: en/live-config.7:172
msgid "configures sysvinit."
msgstr "konfiguriert sysvinit."
#. type: IP
-#: en/live-config.7:170
+#: en/live-config.7:172
#, no-wrap
msgid "B<sysv-rc>"
msgstr "B<sysv-rc>"
#. type: Plain text
-#: en/live-config.7:172
+#: en/live-config.7:174
msgid "configures sysv-rc by disabling listed services."
msgstr "konfiguriert sysv-rc durch abschalten von angegebenen Services."
#. type: IP
-#: en/live-config.7:172 en/live-config.7:204
+#: en/live-config.7:174 en/live-config.7:206
#, no-wrap
msgid "B<login>"
msgstr "B<login>"
#. type: Plain text
-#: en/live-config.7:174 en/live-config.7:206
+#: en/live-config.7:176 en/live-config.7:208
msgid "disables lastlog."
msgstr "schaltet lastlog ab."
#. type: IP
-#: en/live-config.7:174
+#: en/live-config.7:176
#, no-wrap
msgid "B<apport> (ubuntu only)"
msgstr "B<apport> (nur Ubuntu)"
#. type: Plain text
-#: en/live-config.7:176
+#: en/live-config.7:178
msgid "disables apport."
msgstr "schaltet apport ab."
#. type: IP
-#: en/live-config.7:176
+#: en/live-config.7:178
#, no-wrap
msgid "B<gnome-panel-data>"
msgstr "B<gnome-panel-data>"
#. type: Plain text
-#: en/live-config.7:178
+#: en/live-config.7:180
msgid "disables lock button for the screen."
msgstr "entfernt den Sperrknopf für den Bildschirm."
#. type: IP
-#: en/live-config.7:178
+#: en/live-config.7:180
#, no-wrap
msgid "B<gnome-power-manager>"
msgstr "B<gnome-power-manager>"
#. type: Plain text
-#: en/live-config.7:180
+#: en/live-config.7:182
msgid "disables hibernation."
msgstr "verhindert Hibernation."
#. type: IP
-#: en/live-config.7:180
+#: en/live-config.7:182
#, no-wrap
msgid "B<gnome-screensaver>"
msgstr "B<gnome-screensaver>"
#. type: Plain text
-#: en/live-config.7:182
+#: en/live-config.7:184
msgid "disables the screensaver locking the screen."
msgstr ""
"schaltet das Sperren des Bildschirmes während der Bildschirmschoner läuft ab."
#. type: IP
-#: en/live-config.7:182
+#: en/live-config.7:184
#, no-wrap
msgid "B<initramfs-tools>"
msgstr "B<initramfs-tools>"
#. type: Plain text
-#: en/live-config.7:184
+#: en/live-config.7:186
msgid ""
"makes update-initramfs to also update the live media when using persistency."
msgstr ""
@@ -1117,145 +1127,145 @@ msgstr ""
"benutzt wird."
#. type: IP
-#: en/live-config.7:184
+#: en/live-config.7:186
#, no-wrap
msgid "B<kaboom>"
msgstr "B<kaboom>"
#. type: Plain text
-#: en/live-config.7:186
+#: en/live-config.7:188
msgid "disables kde migration wizard (squeeze and newer)."
msgstr "schaltet den KDE Migration Wizard ab (squeeze und neuer)."
#. type: IP
-#: en/live-config.7:186
+#: en/live-config.7:188
#, no-wrap
msgid "B<kde-services>"
msgstr "B<kde-services>"
#. type: Plain text
-#: en/live-config.7:188
+#: en/live-config.7:190
msgid "disables some unwanted KDE services (squeeze and newer)."
msgstr "schaltet ein paar ungewollte KDE Services ab (squeeze und neuer)."
#. type: IP
-#: en/live-config.7:188
+#: en/live-config.7:190
#, no-wrap
msgid "B<kpersonalizer>"
msgstr "B<kpersonalizer>"
#. type: Plain text
-#: en/live-config.7:190
+#: en/live-config.7:192
msgid "disables kde configuration wizard (lenny)."
msgstr "schaltet den KDE Configuration Wizard ab (lenny)."
#. type: IP
-#: en/live-config.7:190
+#: en/live-config.7:192
#, no-wrap
msgid "B<live-installer-launcher>"
msgstr "B<live-installer-launcher>"
#. type: Plain text
-#: en/live-config.7:192
+#: en/live-config.7:194
msgid "adds live-installer-launcher on users desktop."
msgstr "fügt live-installer-launcher auf dem Benutzer Desktop hinzu."
#. type: IP
-#: en/live-config.7:192
+#: en/live-config.7:194
#, no-wrap
msgid "B<module-init-tools>"
msgstr "B<module-init-tools>"
#. type: Plain text
-#: en/live-config.7:194
+#: en/live-config.7:196
msgid "automatically load some modules on some architectures."
msgstr "lädt automatisch gewisse Module auf bestimmten Architekturen."
#. type: IP
-#: en/live-config.7:194
+#: en/live-config.7:196
#, no-wrap
msgid "B<policykit>"
msgstr "B<policykit>"
#. type: Plain text
-#: en/live-config.7:196
+#: en/live-config.7:198
msgid "grant user privilegies through policykit."
msgstr "räumt dem Benutzer Privilegien durch policykit ein."
#. type: IP
-#: en/live-config.7:196
+#: en/live-config.7:198
#, no-wrap
msgid "B<sslcert>"
msgstr "B<sslcert>"
#. type: Plain text
-#: en/live-config.7:198
+#: en/live-config.7:200
msgid "regenerating ssl snake-oil certificates."
msgstr "erneuert SSL snake-oil Zertifikate."
#. type: IP
-#: en/live-config.7:198
+#: en/live-config.7:200
#, no-wrap
msgid "B<update-notifier>"
msgstr "B<update-notifier>"
#. type: Plain text
-#: en/live-config.7:200
+#: en/live-config.7:202
msgid "disables update-notifier."
msgstr "schaltet update-notifier ab."
#. type: IP
-#: en/live-config.7:200
+#: en/live-config.7:202
#, no-wrap
msgid "B<anacron>"
msgstr "B<anacron>"
#. type: Plain text
-#: en/live-config.7:202
+#: en/live-config.7:204
msgid "disables anacron."
msgstr "schaltet anacron aus."
#. type: IP
-#: en/live-config.7:202
+#: en/live-config.7:204
#, no-wrap
msgid "B<util-linux>"
msgstr "B<util-linux>"
#. type: Plain text
-#: en/live-config.7:204
+#: en/live-config.7:206
msgid "disables util-linux' hwclock."
msgstr "schaltet hwclock von util-linux ab."
#. type: IP
-#: en/live-config.7:206
+#: en/live-config.7:208
#, no-wrap
msgid "B<xserver-xorg>"
msgstr "B<xserver-xorg>"
#. type: Plain text
-#: en/live-config.7:208
+#: en/live-config.7:210
msgid "configures xserver-xorg."
msgstr "konfiguriert xserver-xorg."
#. type: IP
-#: en/live-config.7:208
+#: en/live-config.7:210
#, no-wrap
msgid "B<ureadahead> (ubuntu only)"
msgstr "B<ureadahead> (nur Ubuntu)"
#. type: Plain text
-#: en/live-config.7:210
+#: en/live-config.7:212
msgid "disables ureadahead."
msgstr "schaltet ureadahead ab."
#. type: IP
-#: en/live-config.7:210
+#: en/live-config.7:212
#, no-wrap
msgid "B<hooks>"
msgstr "B<hooks>"
#. type: Plain text
-#: en/live-config.7:212
+#: en/live-config.7:214
msgid ""
"allows to run arbitrary commands from a script placed on the live media or "
"an http/ftp server."
@@ -1264,77 +1274,77 @@ msgstr ""
"einem HTTP/FTP Server auszuführen."
#. type: SH
-#: en/live-config.7:213
+#: en/live-config.7:215
#, no-wrap
msgid "FILES"
msgstr "DATEIEN"
#. type: IP
-#: en/live-config.7:214
+#: en/live-config.7:216
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr "B</etc/live/config.conf>"
#. type: IP
-#: en/live-config.7:215
+#: en/live-config.7:217
#, no-wrap
msgid "B</etc/live/config.conf.d/>"
msgstr "B</etc/live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:216
+#: en/live-config.7:218
#, no-wrap
msgid "B<live/config.conf>"
msgstr "B<live/config.conf>"
#. type: IP
-#: en/live-config.7:217
+#: en/live-config.7:219
#, no-wrap
msgid "B<live/config.conf.d/>"
msgstr "B<live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:218
+#: en/live-config.7:220
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr "B</lib/live/config.sh>"
#. type: IP
-#: en/live-config.7:219
+#: en/live-config.7:221
#, no-wrap
msgid "B</lib/live/config/>"
msgstr "B</lib/live/config/>"
#. type: IP
-#: en/live-config.7:220
+#: en/live-config.7:222
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr "B</var/lib/live/config/>"
#. type: SH
-#: en/live-config.7:222
+#: en/live-config.7:224
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-config.7:224
+#: en/live-config.7:226
msgid "I<live-boot>(7)"
msgstr "I<live-boot>(7)"
#. type: Plain text
-#: en/live-config.7:226
+#: en/live-config.7:228
msgid "I<live-helper>(7)"
msgstr "I<live-helper>(7)"
#. type: SH
-#: en/live-config.7:227
+#: en/live-config.7:229
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-config.7:229
+#: en/live-config.7:231
msgid ""
"More information about live-config and the Debian Live project can be found "
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -1345,13 +1355,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-config.7:230
+#: en/live-config.7:232
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-config.7:232
+#: en/live-config.7:234
msgid ""
"Bugs can be reported by submitting a bugreport for the live-config package "
"in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or "
@@ -1365,13 +1375,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-config.7:233
+#: en/live-config.7:235
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-config.7:234
+#: en/live-config.7:236
msgid ""
"live-config was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
"the Debian project."
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index 2935e8d..e878d85 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~a14\n"
-"POT-Creation-Date: 2010-07-16 21:43+0300\n"
+"POT-Creation-Date: 2010-07-16 21:53+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"
@@ -417,14 +417,21 @@ msgid ""
"with the keyword 'medium'."
msgstr ""
+#. type: Plain text
+#: en/live-config.7:71
+msgid ""
+"If several mechanisms are combined, then filesystem hooks are executed "
+"first, then medium hooks, and last the network hooks."
+msgstr ""
+
#. type: SS
-#: en/live-config.7:70
+#: en/live-config.7:72
#, no-wrap
msgid "Boot Parameters (shortcuts)"
msgstr "Paramètres d'amorçage (raccourcis)"
#. type: Plain text
-#: en/live-config.7:72
+#: en/live-config.7:74
msgid ""
"For some common use cases where it would require to combine several "
"individual parameters, B<live-config> provides shortcuts. This allows both "
@@ -435,13 +442,13 @@ msgstr ""
"facilement plusieurs options."
#. type: IP
-#: en/live-config.7:73
+#: en/live-config.7:75
#, no-wrap
msgid "B<live-config.noroot> | B<noroot>"
msgstr "B<live-config.noroot> | B<noroot>"
#. type: Plain text
-#: en/live-config.7:75
+#: en/live-config.7:77
msgid ""
"Disables the sudo and policykit, the user cannot gain root privileges on the "
"system."
@@ -450,24 +457,24 @@ msgstr ""
"bénéficier des privilèges administrateur (root) sur le système."
#. type: IP
-#: en/live-config.7:75
+#: en/live-config.7:77
#, no-wrap
msgid "B<live-config.noautologin> | B<noautologin>"
msgstr "B<live-config.nottyautologin> | B<noautologin>"
#. type: Plain text
-#: en/live-config.7:77
+#: en/live-config.7:79
msgid "Disables both the automatic console login and the graphical autologin."
msgstr "Désactive l'auto-login sur la console et l'auto-login graphique."
#. type: IP
-#: en/live-config.7:77
+#: en/live-config.7:79
#, no-wrap
msgid "B<live-config.nottyautologin> | B<nottyautologin>"
msgstr "B<live-config.nottyautologin> | B<nottyautologin>"
#. type: Plain text
-#: en/live-config.7:79
+#: en/live-config.7:81
msgid ""
"Disables the automatic login on the console, not affecting the graphical "
"autologin."
@@ -476,13 +483,13 @@ msgstr ""
"graphique."
#. type: IP
-#: en/live-config.7:79
+#: en/live-config.7:81
#, no-wrap
msgid "B<live-config.nox11autologin> | B<nox11autologin>"
msgstr "B<live-config.nox11autologin> | B<nox11autologin>"
#. type: Plain text
-#: en/live-config.7:81
+#: en/live-config.7:83
msgid ""
"Disables the automatic login with any display manager, not affecting tty "
"autologin."
@@ -491,35 +498,35 @@ msgstr ""
"l'auto-login en console (tty)."
#. type: SS
-#: en/live-config.7:82
+#: en/live-config.7:84
#, no-wrap
msgid "Boot Parameters (special options)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:84
+#: en/live-config.7:86
msgid "For special use cases there are some special boot paramters."
msgstr ""
#. type: IP
-#: en/live-config.7:85
+#: en/live-config.7:87
#, no-wrap
msgid "B<live-config.debug> | B<debug>"
msgstr "B<live-config.debug> | B<debug>"
#. type: Plain text
-#: en/live-config.7:87
+#: en/live-config.7:89
msgid "Enables debug output in live-config."
msgstr ""
#. type: SS
-#: en/live-config.7:88
+#: en/live-config.7:90
#, no-wrap
msgid "Configuration Files"
msgstr "Fichiers de configuration"
#. type: Plain text
-#: en/live-config.7:90
+#: en/live-config.7:92
msgid ""
"B<live-config> can be configured (but not activated) through configuration "
"files. Everything but the shortcuts that can be configured with a boot "
@@ -529,7 +536,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:92
+#: en/live-config.7:94
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/"
@@ -544,7 +551,7 @@ msgstr ""
"ont la préséance sur ceux placés dans la racine du système."
#. type: Plain text
-#: en/live-config.7:94
+#: en/live-config.7:96
msgid ""
"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 "
@@ -559,13 +566,13 @@ msgstr ""
"de fichier comme 'debian-eeepc.conf')."
#. type: IP
-#: en/live-config.7:95
+#: en/live-config.7:97
#, no-wrap
msgid "B<LIVE_CONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
msgstr "B<LIVE_CONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
#. type: Plain text
-#: en/live-config.7:97
+#: en/live-config.7:99
msgid ""
"This variable equals the 'B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
@@ -574,13 +581,13 @@ msgstr ""
"I<SCRIPT2>, ... I<SCRIPTn>'."
#. type: IP
-#: en/live-config.7:97
+#: en/live-config.7:99
#, no-wrap
msgid "B<LIVE_NOCONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
msgstr "B<LIVE_NOCONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
#. type: Plain text
-#: en/live-config.7:99
+#: en/live-config.7:101
msgid ""
"This variable equals the 'B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
@@ -589,13 +596,13 @@ msgstr ""
"I<SCRIPT2>, ... I<SCRIPTn>'."
#. type: IP
-#: en/live-config.7:99
+#: en/live-config.7:101
#, no-wrap
msgid "B<LIVE_HOSTNAME>=I<HOSTNAME>"
msgstr "B<LIVE_HOSTNAME>=I<NOM_D_HÔTE>"
#. type: Plain text
-#: en/live-config.7:101
+#: en/live-config.7:103
msgid ""
"This variable equals the 'B<live-config.hostname>=I<HOSTAME>' parameter."
msgstr ""
@@ -603,13 +610,13 @@ msgstr ""
"hostname>=I<NOM_D_HÔTE>'."
#. type: IP
-#: en/live-config.7:101
+#: en/live-config.7:103
#, no-wrap
msgid "B<LIVE_USERNAME>=I<USERNAME>"
msgstr "B<LIVE_USERNAME>=I<NOM_D_UTILISATEUR>"
#. type: Plain text
-#: en/live-config.7:103
+#: en/live-config.7:105
msgid ""
"This variable equals the 'B<live-config.username>=I<USERNAME>' parameter."
msgstr ""
@@ -617,13 +624,13 @@ msgstr ""
"username>=I<NOM_D_UTILISATEUR>'."
#. type: IP
-#: en/live-config.7:103
+#: en/live-config.7:105
#, no-wrap
msgid "B<LIVE_USER_FULLNAME>=\"I<USER FULLNAME\">"
msgstr "B<LIVE_USER_FULLNAME>=\"I<NOM_COMPLET_D_UTILISATEUR\">"
#. type: Plain text
-#: en/live-config.7:105
+#: en/live-config.7:107
msgid ""
"This variable equals the 'B<live-config.user-fullname>=\"I<USER FULLNAME>\"' "
"parameter."
@@ -632,13 +639,13 @@ msgstr ""
"\"I<NOM_COMPLET_D_UTILISATEUR\">'."
#. type: IP
-#: en/live-config.7:105
+#: en/live-config.7:107
#, no-wrap
msgid "B<LIVE_LOCALES>=I<LOCALE1>,I<LOCALE2> ... I<LOCALEn>"
msgstr "B<LIVE_LOCALES>=I<LOCALISATION>,I<LOCALISATION> ... I<LOCALISATION>"
#. type: Plain text
-#: en/live-config.7:107
+#: en/live-config.7:109
msgid ""
"This variable equals the 'B<live-config.locales>=I<LOCALE1>,I<LOCALE2> ... "
"I<LOCALEn>' parameter."
@@ -647,37 +654,37 @@ msgstr ""
"locales>=I<LOCALISATION>,I<LOCALISATION> ... I<LOCALISATION>'."
#. type: IP
-#: en/live-config.7:107
+#: en/live-config.7:109
#, no-wrap
msgid "B<LIVE_TIMEZONE>=I<TIMEZONE>"
msgstr "B<LIVE_TIMEZONE>=I<TIMEZONE>"
#. type: Plain text
-#: en/live-config.7:109
+#: en/live-config.7:111
msgid ""
"This variable equals the 'B<live-config.timezone>=I<TIMEZONE>' parameter."
msgstr ""
"Cette variable correspond au paramètre 'B<live-config.timezone>=I<TIMEZONE>'."
#. type: IP
-#: en/live-config.7:109
+#: en/live-config.7:111
#, no-wrap
msgid "B<LIVE_UTC>=B<yes>|no"
msgstr "B<LIVE_UTC>=B<yes>|no"
#. type: Plain text
-#: en/live-config.7:111
+#: en/live-config.7:113
msgid "This variable equals the 'B<live-config.utc>=B<yes>|no' parameter."
msgstr "Cette variable correspond au paramètre 'B<live-config.utc>=B<yes>|no'."
#. type: IP
-#: en/live-config.7:111
+#: en/live-config.7:113
#, no-wrap
msgid "B<LIVE_KEYBOARD_MODEL>=I<KEYBOARD_MODEL>"
msgstr "B<LIVE_KEYBOARD_MODEL>=I<MODÈLE_DE_CLAVIER>"
#. type: Plain text
-#: en/live-config.7:113
+#: en/live-config.7:115
msgid ""
"This variable equals the 'B<live-config.keyboard-model>=I<KEYBOARD_MODEL>' "
"parameter."
@@ -686,13 +693,13 @@ msgstr ""
"model>=I<MODÈLE_DE_CLAVIER>'."
#. type: IP
-#: en/live-config.7:113
+#: en/live-config.7:115
#, no-wrap
msgid "B<LIVE_KEYBOARD_LAYOUTS>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>"
msgstr "B<LIVE_KEYBOARD_LAYOUTS>=I<CONFIGURATION_DU_CLAVIER1>,I<CONFIGURATION_DU_CLAVIER2> ... I<CONFIGURATION_DU_CLAVIERn>"
#. type: Plain text
-#: en/live-config.7:115
+#: en/live-config.7:117
msgid ""
"This variable equals the 'B<live-config.keyboard-"
"layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>' "
@@ -703,13 +710,13 @@ msgstr ""
"I<CONFIGURATION_DU_CLAVIERn>'."
#. type: IP
-#: en/live-config.7:115
+#: en/live-config.7:117
#, no-wrap
msgid "B<LIVE_KEYBOARD_VARIANT>=I<KEYBOARD_VARIANT>"
msgstr "B<LIVE_KEYBOARD_VARIANT>=I<TYPE_DE_CLAVIER>"
#. type: Plain text
-#: en/live-config.7:117
+#: en/live-config.7:119
msgid ""
"This variable equals the 'B<live-config.keyboard-"
"variant>=I<KEYBOARD_VARIANT>' parameter."
@@ -718,13 +725,13 @@ msgstr ""
"variant>=I<TYPE_DE_CLAVIER>'."
#. type: IP
-#: en/live-config.7:117
+#: en/live-config.7:119
#, no-wrap
msgid "B<LIVE_KEYBOARD_OPTIONS>=I<KEYBOARD_OPTIONS>"
msgstr "B<LIVE_KEYBOARD_OPTIONS>=I<OPTIONS_DU_CLAVIER>"
#. type: Plain text
-#: en/live-config.7:119
+#: en/live-config.7:121
msgid ""
"This variable equals the 'B<live-config.keyboard-"
"options>=I<KEYBOARD_OPTIONS>' parameter."
@@ -733,13 +740,13 @@ msgstr ""
"options>=I<OPTIONS_DU_CLAVIER>'."
#. type: IP
-#: en/live-config.7:119
+#: en/live-config.7:121
#, no-wrap
msgid "B<LIVE_SYSV_RC>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn>"
msgstr "B<LIVE_SYSV_RC>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn>"
#. type: Plain text
-#: en/live-config.7:121
+#: en/live-config.7:123
msgid ""
"This variable equals the 'B<live-config.sysv-rc>=I<SERVICE1>,I<SERVICE2> ... "
"I<SERVICEn>' parameter."
@@ -748,13 +755,13 @@ msgstr ""
"I<SERVICE2> ... I<SERVICEn>'."
#. type: IP
-#: en/live-config.7:121
+#: en/live-config.7:123
#, no-wrap
msgid "B<LIVE_XORG_DRIVER>=I<XORG_DRIVER>"
msgstr "B<LIVE_XORG_DRIVER>=I<DRIVER_PAR_XORG>"
#. type: Plain text
-#: en/live-config.7:123
+#: en/live-config.7:125
msgid ""
"This variable equals the 'B<live-config.xorg-driver>=I<XORG_DRIVER>' "
"parameter."
@@ -763,13 +770,13 @@ msgstr ""
"driver>=I<DRIVER_PAR_XORG>."
#. type: IP
-#: en/live-config.7:123
+#: en/live-config.7:125
#, no-wrap
msgid "B<LIVE_XORG_RESOLUTION>=I<XORG_RESOLUTION>"
msgstr "B<LIVE_XORG_RESOLUTION>=I<RÉSOLUTION_PAR_XORG>"
#. type: Plain text
-#: en/live-config.7:125
+#: en/live-config.7:127
msgid ""
"This variable equals the 'B<live-config.xorg-resolution>=I<XORG_RESOLUTION>' "
"parameter."
@@ -778,13 +785,13 @@ msgstr ""
"resolution>=I<RÉSOLUTION_PAR_XORG>'."
#. type: IP
-#: en/live-config.7:125
+#: en/live-config.7:127
#, no-wrap
msgid "B<LIVE_HOOKS>=filesystem|medium|I<URL1>|I<URL2>| ... |I<URLn>"
msgstr "B<LIVE_HOOKS>=filesystem|medium|I<URL1>|I<URL2>| ... |I<URLn>"
#. type: Plain text
-#: en/live-config.7:127
+#: en/live-config.7:129
msgid ""
"This variable equals the 'B<live-config.hooks>=filesystem|medium|I<URL1>|"
"I<URL2>| ... |I<URLn>' parameter."
@@ -793,26 +800,26 @@ msgstr ""
"medium|I<URL1>|I<URL2>| ... |I<URLn>'."
#. type: SH
-#: en/live-config.7:128
+#: en/live-config.7:130
#, no-wrap
msgid "CUSTOMIZATION"
msgstr ""
#. type: Plain text
-#: en/live-config.7:130
+#: en/live-config.7:132
msgid ""
"B<live-config> can be easily customized for downstream projects or local "
"usage."
msgstr ""
#. type: SS
-#: en/live-config.7:131
+#: en/live-config.7:133
#, no-wrap
msgid "Adding new config scripts"
msgstr "Ajout de nouveaux scripts de configuration"
#. type: Plain text
-#: en/live-config.7:133
+#: en/live-config.7:135
msgid ""
"Downstream projects can put their scripts into /lib/live/config and don't "
"need to do anything else, the scripts will be called automatically during "
@@ -820,7 +827,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:135
+#: en/live-config.7:137
msgid ""
"The scripts are best put into an own debian package. A sample package "
"containing an example script can be found in /usr/share/doc/live-config/"
@@ -831,13 +838,13 @@ msgstr ""
"doc/live-config/examples."
#. type: SS
-#: en/live-config.7:136
+#: en/live-config.7:138
#, no-wrap
msgid "Removing existing config scripts"
msgstr "Enlevant des scripts de configuration existant"
#. type: Plain text
-#: en/live-config.7:138
+#: en/live-config.7:140
msgid ""
"It's not really possible to remove scripts itself in a sane way yet without "
"requiring to ship a locally modified B<live-config> package. However, the "
@@ -848,7 +855,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:140
+#: en/live-config.7:142
msgid ""
"The configuration files for the live system itself are best put into an own "
"debian package. A sample package containing an example configuration can be "
@@ -860,234 +867,234 @@ msgstr ""
"examples."
#. type: SH
-#: en/live-config.7:141
+#: en/live-config.7:143
#, no-wrap
msgid "SCRIPTS"
msgstr "SCRIPTS"
#. type: Plain text
-#: en/live-config.7:143
+#: en/live-config.7:145
msgid ""
"B<live-config> currently features the following scripts in /lib/live/config."
msgstr ""
#. type: IP
-#: en/live-config.7:144
+#: en/live-config.7:146
#, no-wrap
msgid "B<hostname>"
msgstr "B<hostname>"
#. type: Plain text
-#: en/live-config.7:146
+#: en/live-config.7:148
msgid "configures /etc/hostname and /etc/hosts."
msgstr ""
#. type: IP
-#: en/live-config.7:146
+#: en/live-config.7:148
#, no-wrap
msgid "B<user-setup>"
msgstr "B<user-setup>"
#. type: Plain text
-#: en/live-config.7:148
+#: en/live-config.7:150
msgid "adds an live user account."
msgstr "ajoute un compte live d'utilisateur."
#. type: IP
-#: en/live-config.7:148
+#: en/live-config.7:150
#, no-wrap
msgid "B<sudo>"
msgstr "B<sudo>"
#. type: Plain text
-#: en/live-config.7:150
+#: en/live-config.7:152
msgid "grants sudo privileges to the live user."
msgstr "offre les privilèges sudo à l'utilisateur live."
#. type: IP
-#: en/live-config.7:150
+#: en/live-config.7:152
#, no-wrap
msgid "B<locales>"
msgstr "B<locales>"
#. type: Plain text
-#: en/live-config.7:152
+#: en/live-config.7:154
msgid "configures locales."
msgstr "cnofigure les locales."
#. type: IP
-#: en/live-config.7:152
+#: en/live-config.7:154
#, no-wrap
msgid "B<tzdata>"
msgstr "B<tzdata>"
#. type: Plain text
-#: en/live-config.7:154
+#: en/live-config.7:156
msgid "configures /etc/timezone."
msgstr "configure /etc/timezone."
#. type: IP
-#: en/live-config.7:154
+#: en/live-config.7:156
#, no-wrap
msgid "B<gdm>"
msgstr "B<gdm>"
#. type: Plain text
-#: en/live-config.7:156
+#: en/live-config.7:158
msgid "configures autologin in gdm."
msgstr "configure l'auto-login dans gdm."
#. type: IP
-#: en/live-config.7:156
+#: en/live-config.7:158
#, no-wrap
msgid "B<gdm3>"
msgstr "B<gdm3>"
#. type: Plain text
-#: en/live-config.7:158
+#: en/live-config.7:160
msgid "configures autologin in gdm3 (squeeze and newer)."
msgstr "configure l'auto-login dans gdm3 (squeeze et plus récent)."
#. type: IP
-#: en/live-config.7:158
+#: en/live-config.7:160
#, no-wrap
msgid "B<kdm>"
msgstr "B<kdm>"
#. type: Plain text
-#: en/live-config.7:160
+#: en/live-config.7:162
msgid "configures autologin in kdm."
msgstr "configure l'auto-login dans kdm."
#. type: IP
-#: en/live-config.7:160
+#: en/live-config.7:162
#, no-wrap
msgid "B<lxdm>"
msgstr "B<lxdm>"
#. type: Plain text
-#: en/live-config.7:162
+#: en/live-config.7:164
msgid "configures autologin in lxdm."
msgstr "configure l'auto-login dans lxdm."
#. type: IP
-#: en/live-config.7:162
+#: en/live-config.7:164
#, no-wrap
msgid "B<nodm>"
msgstr "B<nodm>"
#. type: Plain text
-#: en/live-config.7:164
+#: en/live-config.7:166
msgid "configures autologin in nodm."
msgstr "configure l'auto-login dans nodm."
#. type: IP
-#: en/live-config.7:164
+#: en/live-config.7:166
#, no-wrap
msgid "B<slim>"
msgstr "B<slim>"
#. type: Plain text
-#: en/live-config.7:166
+#: en/live-config.7:168
msgid "configures autologin in slim."
msgstr "configure l'auto-login dans slim."
#. type: IP
-#: en/live-config.7:166
+#: en/live-config.7:168
#, no-wrap
msgid "B<console-common>, B<console-setup> (lenny), B<keyboard-configuration> (squeeze and newer)"
msgstr "B<console-common>, B<console-setup> (lenny), B<keyboard-configuration> (squeeze et plus récent)"
#. type: Plain text
-#: en/live-config.7:168
+#: en/live-config.7:170
msgid "configures the keyboard."
msgstr "configure le clavier."
#. type: IP
-#: en/live-config.7:168
+#: en/live-config.7:170
#, no-wrap
msgid "B<sysvinit>"
msgstr "B<sysvinit>"
#. type: Plain text
-#: en/live-config.7:170
+#: en/live-config.7:172
msgid "configures sysvinit."
msgstr "configure sysvinit."
#. type: IP
-#: en/live-config.7:170
+#: en/live-config.7:172
#, no-wrap
msgid "B<sysv-rc>"
msgstr "B<sysv-rc>"
#. type: Plain text
-#: en/live-config.7:172
+#: en/live-config.7:174
msgid "configures sysv-rc by disabling listed services."
msgstr "configure sysv-rc en désactivant les services listés."
#. type: IP
-#: en/live-config.7:172 en/live-config.7:204
+#: en/live-config.7:174 en/live-config.7:206
#, no-wrap
msgid "B<login>"
msgstr "B<login>"
#. type: Plain text
-#: en/live-config.7:174 en/live-config.7:206
+#: en/live-config.7:176 en/live-config.7:208
msgid "disables lastlog."
msgstr "désactive lastlog."
#. type: IP
-#: en/live-config.7:174
+#: en/live-config.7:176
#, no-wrap
msgid "B<apport> (ubuntu only)"
msgstr "B<apport> (seulement ubuntu)"
#. type: Plain text
-#: en/live-config.7:176
+#: en/live-config.7:178
msgid "disables apport."
msgstr "désactive apport."
#. type: IP
-#: en/live-config.7:176
+#: en/live-config.7:178
#, no-wrap
msgid "B<gnome-panel-data>"
msgstr "B<gnome-panel-data>"
#. type: Plain text
-#: en/live-config.7:178
+#: en/live-config.7:180
msgid "disables lock button for the screen."
msgstr "désactive le bouton de verrouillage de l'écran."
#. type: IP
-#: en/live-config.7:178
+#: en/live-config.7:180
#, no-wrap
msgid "B<gnome-power-manager>"
msgstr "B<gnome-power-manager>"
#. type: Plain text
-#: en/live-config.7:180
+#: en/live-config.7:182
msgid "disables hibernation."
msgstr "désactive l'hibernation."
#. type: IP
-#: en/live-config.7:180
+#: en/live-config.7:182
#, no-wrap
msgid "B<gnome-screensaver>"
msgstr "B<gnome-screensaver>"
#. type: Plain text
-#: en/live-config.7:182
+#: en/live-config.7:184
msgid "disables the screensaver locking the screen."
msgstr "désactive le verrouillage de session par l'économiseur d'écran."
#. type: IP
-#: en/live-config.7:182
+#: en/live-config.7:184
#, no-wrap
msgid "B<initramfs-tools>"
msgstr "B<initramfs-tools>"
#. type: Plain text
-#: en/live-config.7:184
+#: en/live-config.7:186
msgid ""
"makes update-initramfs to also update the live media when using persistency."
msgstr ""
@@ -1095,146 +1102,146 @@ msgstr ""
"persistance."
#. type: IP
-#: en/live-config.7:184
+#: en/live-config.7:186
#, no-wrap
msgid "B<kaboom>"
msgstr "B<kaboom>"
#. type: Plain text
-#: en/live-config.7:186
+#: en/live-config.7:188
msgid "disables kde migration wizard (squeeze and newer)."
msgstr "désactive l'assistant de migration de kde (squeeze et plus récent)."
#. type: IP
-#: en/live-config.7:186
+#: en/live-config.7:188
#, no-wrap
msgid "B<kde-services>"
msgstr "B<kde-services>"
#. type: Plain text
-#: en/live-config.7:188
+#: en/live-config.7:190
msgid "disables some unwanted KDE services (squeeze and newer)."
msgstr "désactive des services de KDE non souhaités (squeeze et plus récent)."
#. type: IP
-#: en/live-config.7:188
+#: en/live-config.7:190
#, no-wrap
msgid "B<kpersonalizer>"
msgstr "B<kerpsonalizer>"
#. type: Plain text
-#: en/live-config.7:190
+#: en/live-config.7:192
msgid "disables kde configuration wizard (lenny)."
msgstr "désactive le lancement du paramétrage de configuration de kde (lenny)."
#. type: IP
-#: en/live-config.7:190
+#: en/live-config.7:192
#, no-wrap
msgid "B<live-installer-launcher>"
msgstr "B<live-installer-launcher>"
#. type: Plain text
-#: en/live-config.7:192
+#: en/live-config.7:194
msgid "adds live-installer-launcher on users desktop."
msgstr ""
"ajoute l'installeur (live-installer-launcher) sur le bureau des utilisateurs."
#. type: IP
-#: en/live-config.7:192
+#: en/live-config.7:194
#, no-wrap
msgid "B<module-init-tools>"
msgstr "B<module-init-tools>"
#. type: Plain text
-#: en/live-config.7:194
+#: en/live-config.7:196
msgid "automatically load some modules on some architectures."
msgstr "charge automatiquement certains modules sur certaines architectures."
#. type: IP
-#: en/live-config.7:194
+#: en/live-config.7:196
#, no-wrap
msgid "B<policykit>"
msgstr "B<policykit>"
#. type: Plain text
-#: en/live-config.7:196
+#: en/live-config.7:198
msgid "grant user privilegies through policykit."
msgstr "accorde à l'utilisateur des privilèges via le policykit."
#. type: IP
-#: en/live-config.7:196
+#: en/live-config.7:198
#, no-wrap
msgid "B<sslcert>"
msgstr "B<sslcert>"
#. type: Plain text
-#: en/live-config.7:198
+#: en/live-config.7:200
msgid "regenerating ssl snake-oil certificates."
msgstr "regénère les certificats ssl."
#. type: IP
-#: en/live-config.7:198
+#: en/live-config.7:200
#, no-wrap
msgid "B<update-notifier>"
msgstr "B<update-notifier>"
#. type: Plain text
-#: en/live-config.7:200
+#: en/live-config.7:202
msgid "disables update-notifier."
msgstr "désactive update-notifier."
#. type: IP
-#: en/live-config.7:200
+#: en/live-config.7:202
#, no-wrap
msgid "B<anacron>"
msgstr "B<anacron>"
#. type: Plain text
-#: en/live-config.7:202
+#: en/live-config.7:204
msgid "disables anacron."
msgstr "désactive anacron."
#. type: IP
-#: en/live-config.7:202
+#: en/live-config.7:204
#, no-wrap
msgid "B<util-linux>"
msgstr "B<util-linux>"
#. type: Plain text
-#: en/live-config.7:204
+#: en/live-config.7:206
msgid "disables util-linux' hwclock."
msgstr "désactive util-linux' heure hardware."
#. type: IP
-#: en/live-config.7:206
+#: en/live-config.7:208
#, no-wrap
msgid "B<xserver-xorg>"
msgstr "B<xserver-xorg>"
#. type: Plain text
-#: en/live-config.7:208
+#: en/live-config.7:210
msgid "configures xserver-xorg."
msgstr "configure xserver-xorg."
#. type: IP
-#: en/live-config.7:208
+#: en/live-config.7:210
#, no-wrap
msgid "B<ureadahead> (ubuntu only)"
msgstr "B<ureadahead> (seulement ubuntu)"
#. type: Plain text
-#: en/live-config.7:210
+#: en/live-config.7:212
msgid "disables ureadahead."
msgstr "désactive ureadahead."
#. type: IP
-#: en/live-config.7:210
+#: en/live-config.7:212
#, no-wrap
msgid "B<hooks>"
msgstr "B<hooks>"
#. type: Plain text
-#: en/live-config.7:212
+#: en/live-config.7:214
msgid ""
"allows to run arbitrary commands from a script placed on the live media or "
"an http/ftp server."
@@ -1243,77 +1250,77 @@ msgstr ""
"média live, ou sur un serveur http/ftp."
#. type: SH
-#: en/live-config.7:213
+#: en/live-config.7:215
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/live-config.7:214
+#: en/live-config.7:216
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr "B</etc/live/config.conf>"
#. type: IP
-#: en/live-config.7:215
+#: en/live-config.7:217
#, no-wrap
msgid "B</etc/live/config.conf.d/>"
msgstr "B</etc/live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:216
+#: en/live-config.7:218
#, no-wrap
msgid "B<live/config.conf>"
msgstr "B<live/config.conf>"
#. type: IP
-#: en/live-config.7:217
+#: en/live-config.7:219
#, no-wrap
msgid "B<live/config.conf.d/>"
msgstr "B<live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:218
+#: en/live-config.7:220
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr "B</lib/live/config.sh>"
#. type: IP
-#: en/live-config.7:219
+#: en/live-config.7:221
#, no-wrap
msgid "B</lib/live/config/>"
msgstr "B</lib/live/config/>"
#. type: IP
-#: en/live-config.7:220
+#: en/live-config.7:222
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr "B</var/lib/live/config/>"
#. type: SH
-#: en/live-config.7:222
+#: en/live-config.7:224
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-config.7:224
+#: en/live-config.7:226
msgid "I<live-boot>(7)"
msgstr "I<live-boot>(7)"
#. type: Plain text
-#: en/live-config.7:226
+#: en/live-config.7:228
msgid "I<live-helper>(7)"
msgstr "I<live-helper>(7)"
#. type: SH
-#: en/live-config.7:227
+#: en/live-config.7:229
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-config.7:229
+#: en/live-config.7:231
msgid ""
"More information about live-config and the Debian Live project can be found "
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -1324,13 +1331,13 @@ msgstr ""
"sur E<lt>I<http://live.debian.net/manual/>E<gt>."
#. type: SH
-#: en/live-config.7:230
+#: en/live-config.7:232
#, no-wrap
msgid "BUGS"
msgstr "BUGS"
#. type: Plain text
-#: en/live-config.7:232
+#: en/live-config.7:234
msgid ""
"Bugs can be reported by submitting a bugreport for the live-config package "
"in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or "
@@ -1343,13 +1350,13 @@ msgstr ""
"E<lt>I<debian-live at lists.debian.org>E<gt>"
#. type: SH
-#: en/live-config.7:233
+#: en/live-config.7:235
#, no-wrap
msgid "AUTHOR"
msgstr "AUTEUR"
#. type: Plain text
-#: en/live-config.7:234
+#: en/live-config.7:236
msgid ""
"live-config was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
"the Debian project."
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 1319a39..c5955c2 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-16 21:43+0300\n"
+"POT-Creation-Date: 2010-07-16 21:53+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"
@@ -354,14 +354,21 @@ msgid ""
"with the keyword 'medium'."
msgstr ""
+#. type: Plain text
+#: en/live-config.7:71
+msgid ""
+"If several mechanisms are combined, then filesystem hooks are executed "
+"first, then medium hooks, and last the network hooks."
+msgstr ""
+
#. type: SS
-#: en/live-config.7:70
+#: en/live-config.7:72
#, no-wrap
msgid "Boot Parameters (shortcuts)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:72
+#: en/live-config.7:74
msgid ""
"For some common use cases where it would require to combine several "
"individual parameters, B<live-config> provides shortcuts. This allows both "
@@ -369,85 +376,85 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-config.7:73
+#: en/live-config.7:75
#, no-wrap
msgid "B<live-config.noroot> | B<noroot>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:75
+#: en/live-config.7:77
msgid ""
"Disables the sudo and policykit, the user cannot gain root privileges on the "
"system."
msgstr ""
#. type: IP
-#: en/live-config.7:75
+#: en/live-config.7:77
#, no-wrap
msgid "B<live-config.noautologin> | B<noautologin>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:77
+#: en/live-config.7:79
msgid "Disables both the automatic console login and the graphical autologin."
msgstr ""
#. type: IP
-#: en/live-config.7:77
+#: en/live-config.7:79
#, no-wrap
msgid "B<live-config.nottyautologin> | B<nottyautologin>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:79
+#: en/live-config.7:81
msgid ""
"Disables the automatic login on the console, not affecting the graphical "
"autologin."
msgstr ""
#. type: IP
-#: en/live-config.7:79
+#: en/live-config.7:81
#, no-wrap
msgid "B<live-config.nox11autologin> | B<nox11autologin>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:81
+#: en/live-config.7:83
msgid ""
"Disables the automatic login with any display manager, not affecting tty "
"autologin."
msgstr ""
#. type: SS
-#: en/live-config.7:82
+#: en/live-config.7:84
#, no-wrap
msgid "Boot Parameters (special options)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:84
+#: en/live-config.7:86
msgid "For special use cases there are some special boot paramters."
msgstr ""
#. type: IP
-#: en/live-config.7:85
+#: en/live-config.7:87
#, no-wrap
msgid "B<live-config.debug> | B<debug>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:87
+#: en/live-config.7:89
msgid "Enables debug output in live-config."
msgstr ""
#. type: SS
-#: en/live-config.7:88
+#: en/live-config.7:90
#, no-wrap
msgid "Configuration Files"
msgstr ""
#. type: Plain text
-#: en/live-config.7:90
+#: en/live-config.7:92
msgid ""
"B<live-config> can be configured (but not activated) through configuration "
"files. Everything but the shortcuts that can be configured with a boot "
@@ -457,7 +464,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:92
+#: en/live-config.7:94
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/"
@@ -467,7 +474,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:94
+#: en/live-config.7:96
msgid ""
"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 "
@@ -477,125 +484,125 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-config.7:95
+#: en/live-config.7:97
#, no-wrap
msgid "B<LIVE_CONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:97
+#: en/live-config.7:99
msgid ""
"This variable equals the 'B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:97
+#: en/live-config.7:99
#, no-wrap
msgid "B<LIVE_NOCONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:99
+#: en/live-config.7:101
msgid ""
"This variable equals the 'B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:99
+#: en/live-config.7:101
#, no-wrap
msgid "B<LIVE_HOSTNAME>=I<HOSTNAME>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:101
+#: en/live-config.7:103
msgid ""
"This variable equals the 'B<live-config.hostname>=I<HOSTAME>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:101
+#: en/live-config.7:103
#, no-wrap
msgid "B<LIVE_USERNAME>=I<USERNAME>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:103
+#: en/live-config.7:105
msgid ""
"This variable equals the 'B<live-config.username>=I<USERNAME>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:103
+#: en/live-config.7:105
#, no-wrap
msgid "B<LIVE_USER_FULLNAME>=\"I<USER FULLNAME\">"
msgstr ""
#. type: Plain text
-#: en/live-config.7:105
+#: en/live-config.7:107
msgid ""
"This variable equals the 'B<live-config.user-fullname>=\"I<USER FULLNAME>\"' "
"parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:105
+#: en/live-config.7:107
#, no-wrap
msgid "B<LIVE_LOCALES>=I<LOCALE1>,I<LOCALE2> ... I<LOCALEn>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:107
+#: en/live-config.7:109
msgid ""
"This variable equals the 'B<live-config.locales>=I<LOCALE1>,I<LOCALE2> ... "
"I<LOCALEn>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:107
+#: en/live-config.7:109
#, no-wrap
msgid "B<LIVE_TIMEZONE>=I<TIMEZONE>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:109
+#: en/live-config.7:111
msgid ""
"This variable equals the 'B<live-config.timezone>=I<TIMEZONE>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:109
+#: en/live-config.7:111
#, no-wrap
msgid "B<LIVE_UTC>=B<yes>|no"
msgstr ""
#. type: Plain text
-#: en/live-config.7:111
+#: en/live-config.7:113
msgid "This variable equals the 'B<live-config.utc>=B<yes>|no' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:111
+#: en/live-config.7:113
#, no-wrap
msgid "B<LIVE_KEYBOARD_MODEL>=I<KEYBOARD_MODEL>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:113
+#: en/live-config.7:115
msgid ""
"This variable equals the 'B<live-config.keyboard-model>=I<KEYBOARD_MODEL>' "
"parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:113
+#: en/live-config.7:115
#, no-wrap
msgid "B<LIVE_KEYBOARD_LAYOUTS>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:115
+#: en/live-config.7:117
msgid ""
"This variable equals the 'B<live-config.keyboard-"
"layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>' "
@@ -603,104 +610,104 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-config.7:115
+#: en/live-config.7:117
#, no-wrap
msgid "B<LIVE_KEYBOARD_VARIANT>=I<KEYBOARD_VARIANT>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:117
+#: en/live-config.7:119
msgid ""
"This variable equals the 'B<live-config.keyboard-"
"variant>=I<KEYBOARD_VARIANT>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:117
+#: en/live-config.7:119
#, no-wrap
msgid "B<LIVE_KEYBOARD_OPTIONS>=I<KEYBOARD_OPTIONS>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:119
+#: en/live-config.7:121
msgid ""
"This variable equals the 'B<live-config.keyboard-"
"options>=I<KEYBOARD_OPTIONS>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:119
+#: en/live-config.7:121
#, no-wrap
msgid "B<LIVE_SYSV_RC>=I<SERVICE1>,I<SERVICE2> ... I<SERVICEn>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:121
+#: en/live-config.7:123
msgid ""
"This variable equals the 'B<live-config.sysv-rc>=I<SERVICE1>,I<SERVICE2> ... "
"I<SERVICEn>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:121
+#: en/live-config.7:123
#, no-wrap
msgid "B<LIVE_XORG_DRIVER>=I<XORG_DRIVER>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:123
+#: en/live-config.7:125
msgid ""
"This variable equals the 'B<live-config.xorg-driver>=I<XORG_DRIVER>' "
"parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:123
+#: en/live-config.7:125
#, no-wrap
msgid "B<LIVE_XORG_RESOLUTION>=I<XORG_RESOLUTION>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:125
+#: en/live-config.7:127
msgid ""
"This variable equals the 'B<live-config.xorg-resolution>=I<XORG_RESOLUTION>' "
"parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:125
+#: en/live-config.7:127
#, no-wrap
msgid "B<LIVE_HOOKS>=filesystem|medium|I<URL1>|I<URL2>| ... |I<URLn>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:127
+#: en/live-config.7:129
msgid ""
"This variable equals the 'B<live-config.hooks>=filesystem|medium|I<URL1>|"
"I<URL2>| ... |I<URLn>' parameter."
msgstr ""
#. type: SH
-#: en/live-config.7:128
+#: en/live-config.7:130
#, no-wrap
msgid "CUSTOMIZATION"
msgstr ""
#. type: Plain text
-#: en/live-config.7:130
+#: en/live-config.7:132
msgid ""
"B<live-config> can be easily customized for downstream projects or local "
"usage."
msgstr ""
#. type: SS
-#: en/live-config.7:131
+#: en/live-config.7:133
#, no-wrap
msgid "Adding new config scripts"
msgstr ""
#. type: Plain text
-#: en/live-config.7:133
+#: en/live-config.7:135
msgid ""
"Downstream projects can put their scripts into /lib/live/config and don't "
"need to do anything else, the scripts will be called automatically during "
@@ -708,7 +715,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:135
+#: en/live-config.7:137
msgid ""
"The scripts are best put into an own debian package. A sample package "
"containing an example script can be found in /usr/share/doc/live-config/"
@@ -716,13 +723,13 @@ msgid ""
msgstr ""
#. type: SS
-#: en/live-config.7:136
+#: en/live-config.7:138
#, no-wrap
msgid "Removing existing config scripts"
msgstr ""
#. type: Plain text
-#: en/live-config.7:138
+#: en/live-config.7:140
msgid ""
"It's not really possible to remove scripts itself in a sane way yet without "
"requiring to ship a locally modified B<live-config> package. However, the "
@@ -733,7 +740,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:140
+#: en/live-config.7:142
msgid ""
"The configuration files for the live system itself are best put into an own "
"debian package. A sample package containing an example configuration can be "
@@ -741,455 +748,455 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:141
+#: en/live-config.7:143
#, no-wrap
msgid "SCRIPTS"
msgstr ""
#. type: Plain text
-#: en/live-config.7:143
+#: en/live-config.7:145
msgid ""
"B<live-config> currently features the following scripts in /lib/live/config."
msgstr ""
#. type: IP
-#: en/live-config.7:144
+#: en/live-config.7:146
#, no-wrap
msgid "B<hostname>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:146
+#: en/live-config.7:148
msgid "configures /etc/hostname and /etc/hosts."
msgstr ""
#. type: IP
-#: en/live-config.7:146
+#: en/live-config.7:148
#, no-wrap
msgid "B<user-setup>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:148
+#: en/live-config.7:150
msgid "adds an live user account."
msgstr ""
#. type: IP
-#: en/live-config.7:148
+#: en/live-config.7:150
#, no-wrap
msgid "B<sudo>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:150
+#: en/live-config.7:152
msgid "grants sudo privileges to the live user."
msgstr ""
#. type: IP
-#: en/live-config.7:150
+#: en/live-config.7:152
#, no-wrap
msgid "B<locales>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:152
+#: en/live-config.7:154
msgid "configures locales."
msgstr ""
#. type: IP
-#: en/live-config.7:152
+#: en/live-config.7:154
#, no-wrap
msgid "B<tzdata>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:154
+#: en/live-config.7:156
msgid "configures /etc/timezone."
msgstr ""
#. type: IP
-#: en/live-config.7:154
+#: en/live-config.7:156
#, no-wrap
msgid "B<gdm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:156
+#: en/live-config.7:158
msgid "configures autologin in gdm."
msgstr ""
#. type: IP
-#: en/live-config.7:156
+#: en/live-config.7:158
#, no-wrap
msgid "B<gdm3>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:158
+#: en/live-config.7:160
msgid "configures autologin in gdm3 (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:158
+#: en/live-config.7:160
#, no-wrap
msgid "B<kdm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:160
+#: en/live-config.7:162
msgid "configures autologin in kdm."
msgstr ""
#. type: IP
-#: en/live-config.7:160
+#: en/live-config.7:162
#, no-wrap
msgid "B<lxdm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:162
+#: en/live-config.7:164
msgid "configures autologin in lxdm."
msgstr ""
#. type: IP
-#: en/live-config.7:162
+#: en/live-config.7:164
#, no-wrap
msgid "B<nodm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:164
+#: en/live-config.7:166
msgid "configures autologin in nodm."
msgstr ""
#. type: IP
-#: en/live-config.7:164
+#: en/live-config.7:166
#, no-wrap
msgid "B<slim>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:166
+#: en/live-config.7:168
msgid "configures autologin in slim."
msgstr ""
#. type: IP
-#: en/live-config.7:166
+#: en/live-config.7:168
#, no-wrap
msgid "B<console-common>, B<console-setup> (lenny), B<keyboard-configuration> (squeeze and newer)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:168
+#: en/live-config.7:170
msgid "configures the keyboard."
msgstr ""
#. type: IP
-#: en/live-config.7:168
+#: en/live-config.7:170
#, no-wrap
msgid "B<sysvinit>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:170
+#: en/live-config.7:172
msgid "configures sysvinit."
msgstr ""
#. type: IP
-#: en/live-config.7:170
+#: en/live-config.7:172
#, no-wrap
msgid "B<sysv-rc>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:172
+#: en/live-config.7:174
msgid "configures sysv-rc by disabling listed services."
msgstr ""
#. type: IP
-#: en/live-config.7:172 en/live-config.7:204
+#: en/live-config.7:174 en/live-config.7:206
#, no-wrap
msgid "B<login>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:174 en/live-config.7:206
+#: en/live-config.7:176 en/live-config.7:208
msgid "disables lastlog."
msgstr ""
#. type: IP
-#: en/live-config.7:174
+#: en/live-config.7:176
#, no-wrap
msgid "B<apport> (ubuntu only)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:176
+#: en/live-config.7:178
msgid "disables apport."
msgstr ""
#. type: IP
-#: en/live-config.7:176
+#: en/live-config.7:178
#, no-wrap
msgid "B<gnome-panel-data>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:178
+#: en/live-config.7:180
msgid "disables lock button for the screen."
msgstr ""
#. type: IP
-#: en/live-config.7:178
+#: en/live-config.7:180
#, no-wrap
msgid "B<gnome-power-manager>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:180
+#: en/live-config.7:182
msgid "disables hibernation."
msgstr ""
#. type: IP
-#: en/live-config.7:180
+#: en/live-config.7:182
#, no-wrap
msgid "B<gnome-screensaver>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:182
+#: en/live-config.7:184
msgid "disables the screensaver locking the screen."
msgstr ""
#. type: IP
-#: en/live-config.7:182
+#: en/live-config.7:184
#, no-wrap
msgid "B<initramfs-tools>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:184
+#: en/live-config.7:186
msgid ""
"makes update-initramfs to also update the live media when using persistency."
msgstr ""
#. type: IP
-#: en/live-config.7:184
+#: en/live-config.7:186
#, no-wrap
msgid "B<kaboom>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:186
+#: en/live-config.7:188
msgid "disables kde migration wizard (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:186
+#: en/live-config.7:188
#, no-wrap
msgid "B<kde-services>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:188
+#: en/live-config.7:190
msgid "disables some unwanted KDE services (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:188
+#: en/live-config.7:190
#, no-wrap
msgid "B<kpersonalizer>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:190
+#: en/live-config.7:192
msgid "disables kde configuration wizard (lenny)."
msgstr ""
#. type: IP
-#: en/live-config.7:190
+#: en/live-config.7:192
#, no-wrap
msgid "B<live-installer-launcher>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:192
+#: en/live-config.7:194
msgid "adds live-installer-launcher on users desktop."
msgstr ""
#. type: IP
-#: en/live-config.7:192
+#: en/live-config.7:194
#, no-wrap
msgid "B<module-init-tools>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:194
+#: en/live-config.7:196
msgid "automatically load some modules on some architectures."
msgstr ""
#. type: IP
-#: en/live-config.7:194
+#: en/live-config.7:196
#, no-wrap
msgid "B<policykit>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:196
+#: en/live-config.7:198
msgid "grant user privilegies through policykit."
msgstr ""
#. type: IP
-#: en/live-config.7:196
+#: en/live-config.7:198
#, no-wrap
msgid "B<sslcert>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:198
+#: en/live-config.7:200
msgid "regenerating ssl snake-oil certificates."
msgstr ""
#. type: IP
-#: en/live-config.7:198
+#: en/live-config.7:200
#, no-wrap
msgid "B<update-notifier>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:200
+#: en/live-config.7:202
msgid "disables update-notifier."
msgstr ""
#. type: IP
-#: en/live-config.7:200
+#: en/live-config.7:202
#, no-wrap
msgid "B<anacron>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:202
+#: en/live-config.7:204
msgid "disables anacron."
msgstr ""
#. type: IP
-#: en/live-config.7:202
+#: en/live-config.7:204
#, no-wrap
msgid "B<util-linux>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:204
+#: en/live-config.7:206
msgid "disables util-linux' hwclock."
msgstr ""
#. type: IP
-#: en/live-config.7:206
+#: en/live-config.7:208
#, no-wrap
msgid "B<xserver-xorg>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:208
+#: en/live-config.7:210
msgid "configures xserver-xorg."
msgstr ""
#. type: IP
-#: en/live-config.7:208
+#: en/live-config.7:210
#, no-wrap
msgid "B<ureadahead> (ubuntu only)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:210
+#: en/live-config.7:212
msgid "disables ureadahead."
msgstr ""
#. type: IP
-#: en/live-config.7:210
+#: en/live-config.7:212
#, no-wrap
msgid "B<hooks>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:212
+#: en/live-config.7:214
msgid ""
"allows to run arbitrary commands from a script placed on the live media or "
"an http/ftp server."
msgstr ""
#. type: SH
-#: en/live-config.7:213
+#: en/live-config.7:215
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/live-config.7:214
+#: en/live-config.7:216
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:215
+#: en/live-config.7:217
#, no-wrap
msgid "B</etc/live/config.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-config.7:216
+#: en/live-config.7:218
#, no-wrap
msgid "B<live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:217
+#: en/live-config.7:219
#, no-wrap
msgid "B<live/config.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-config.7:218
+#: en/live-config.7:220
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr ""
#. type: IP
-#: en/live-config.7:219
+#: en/live-config.7:221
#, no-wrap
msgid "B</lib/live/config/>"
msgstr ""
#. type: IP
-#: en/live-config.7:220
+#: en/live-config.7:222
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr ""
#. type: SH
-#: en/live-config.7:222
+#: en/live-config.7:224
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-config.7:224
+#: en/live-config.7:226
msgid "I<live-boot>(7)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:226
+#: en/live-config.7:228
msgid "I<live-helper>(7)"
msgstr ""
#. type: SH
-#: en/live-config.7:227
+#: en/live-config.7:229
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-config.7:229
+#: en/live-config.7:231
msgid ""
"More information about live-config and the Debian Live project can be found "
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -1197,13 +1204,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:230
+#: en/live-config.7:232
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-config.7:232
+#: en/live-config.7:234
msgid ""
"Bugs can be reported by submitting a bugreport for the live-config package "
"in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or "
@@ -1212,13 +1219,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:233
+#: en/live-config.7:235
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-config.7:234
+#: en/live-config.7:236
msgid ""
"live-config was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
"the Debian project."
diff --git a/scripts/config/999-hooks b/scripts/config/999-hooks
index abc02d5..074be13 100755
--- a/scripts/config/999-hooks
+++ b/scripts/config/999-hooks
@@ -22,25 +22,28 @@ Hooks ()
Process_hooks ()
{
- case "${LIVE_HOOKS}" in
- media)
- if ls /live/image/live/hooks/* 2>&1
- then
- _HOOKS="$(ls /live/image/live/hooks/*)"
- fi
- ;;
+ for _HOOK in $(echo ${LIVE_HOOKS} | sed -e 's/|/ /g')
+ do
+ case "${LIVE_HOOKS}" in
+ filesystem)
+ if ls /lib/live/hooks/* 2>&1
+ then
+ _HOOKS="${_HOOKS} $(ls /lib/live/hooks/*)"
+ fi
+ ;;
- rootfs)
- if ls /lib/live/hooks/* 2>&1
- then
- _HOOKS="$(ls /lib/live/hooks/*)"
- fi
- ;;
+ media)
+ if ls /live/image/live/hooks/* 2>&1
+ then
+ _HOOKS="${_HOOKS} $(ls /live/image/live/hooks/*)"
+ fi
+ ;;
- *)
- _HOOKS="$(echo ${LIVE_HOOKS} | sed -e 's/|/ /g')"
- ;;
- esac
+ *)
+ _HOOKS="${_HOOKS} ${_HOOK}"
+ ;;
+ esac
+ done
for _HOOK in ${_HOOKS}
do
--
live-config
More information about the debian-live-changes
mailing list