[SCM] live-config branch, upstream, updated. upstream/2.0_a5-1-g751474c
Daniel Baumann
daniel at debian.org
Tue Jun 8 04:09:07 UTC 2010
The following commit has been merged in the upstream branch:
commit 751474c7bcb04bd73f25224fb2764862d59e0261
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Jun 8 06:06:03 2010 +0200
Adding upstream version 2.0~a6.
diff --git a/Makefile b/Makefile
index 4116543..1889d8c 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SHELL := sh -e
LANGUAGES = de
-SCRIPTS = examples/scripts/* scripts/config.sh scripts/config/*
+SCRIPTS = scripts/config.sh scripts/config/*
all: test build
diff --git a/VERSION b/VERSION
index d670b1b..a1d37aa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0~a5
+2.0~a6
diff --git a/docs/TODO b/docs/TODO
index e8d7441..a1d87d2 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -18,9 +18,6 @@ we continue to release pre-releases until:
* use build-time distribution detection, remove dead code from build.
* use verbose/quiet/debug/interactive modes for scripts.
* use logfile.
- * write documentation:
- - explain customization.
- - explain precomupted configuration (requires dropping boot parameter and
- having config.conf).
* add upstart integration.
* enable display managers only if they are the selected one.
+ * when not using persistency, do not import options into the debconf db.
diff --git a/docs/customization.txt b/docs/customization.txt
deleted file mode 100644
index 2a80613..0000000
--- a/docs/customization.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Customization
-=============
-
-
-1. Adding new config scripts
-
-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 boot. An
-example script can be found in /usr/share/doc/live-config/examples/scripts.
-
-Such scripts are best put into an own debian package. A sample debian directory
-can be found in /usr/share/doc/live-config/exmaples/debian.
diff --git a/examples/debian/install b/examples/debian/install
deleted file mode 100644
index 5777b64..0000000
--- a/examples/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-scripts/* /lib/live
diff --git a/examples/live-config-foobar/configs/foobar b/examples/live-config-foobar/configs/foobar
new file mode 100644
index 0000000..87eaaf6
--- /dev/null
+++ b/examples/live-config-foobar/configs/foobar
@@ -0,0 +1,3 @@
+# /etc/live/config.conf.d/foobar
+
+LIVE_FOOBAR="foobar"
diff --git a/examples/debian/changelog b/examples/live-config-foobar/debian/changelog
similarity index 100%
rename from examples/debian/changelog
rename to examples/live-config-foobar/debian/changelog
diff --git a/examples/debian/compat b/examples/live-config-foobar/debian/compat
similarity index 100%
rename from examples/debian/compat
rename to examples/live-config-foobar/debian/compat
diff --git a/examples/debian/control b/examples/live-config-foobar/debian/control
similarity index 100%
rename from examples/debian/control
rename to examples/live-config-foobar/debian/control
diff --git a/examples/debian/copyright b/examples/live-config-foobar/debian/copyright
similarity index 100%
rename from examples/debian/copyright
rename to examples/live-config-foobar/debian/copyright
diff --git a/examples/live-config-foobar/debian/install b/examples/live-config-foobar/debian/install
new file mode 100644
index 0000000..3a9670a
--- /dev/null
+++ b/examples/live-config-foobar/debian/install
@@ -0,0 +1,2 @@
+configs/* /etc/live/config.conf.d
+scripts/* /lib/live
diff --git a/examples/debian/rules b/examples/live-config-foobar/debian/rules
similarity index 100%
rename from examples/debian/rules
rename to examples/live-config-foobar/debian/rules
diff --git a/examples/debian/source/format b/examples/live-config-foobar/debian/source/format
similarity index 100%
rename from examples/debian/source/format
rename to examples/live-config-foobar/debian/source/format
diff --git a/examples/scripts/nnn-foobar b/examples/live-config-foobar/scripts/nnn-foobar
similarity index 100%
rename from examples/scripts/nnn-foobar
rename to examples/live-config-foobar/scripts/nnn-foobar
diff --git a/manpages/bin/update-version.sh b/manpages/bin/update-version.sh
index bf829fe..b34c811 100755
--- a/manpages/bin/update-version.sh
+++ b/manpages/bin/update-version.sh
@@ -2,6 +2,8 @@
set -e
+DATE="$(LC_ALL=C date +%Y\\\\-%m\\\\-%d)"
+PROGRAM="LIVE\\\-CONFIG"
VERSION="$(cat ../VERSION)"
echo "Updating version headers..."
@@ -10,5 +12,5 @@ for MANPAGE in en/*
do
SECTION="$(basename ${MANPAGE} | awk -F. '{ print $2 }')"
- sed -i -e "s|^.TH.*$|.TH LIVE\\\-CONFIG ${SECTION} $(date +%Y\\\\-%m\\\\-%d) ${VERSION} \"Debian Live Project\"|" ${MANPAGE}
+ sed -i -e "s|^.TH.*$|.TH ${PROGRAM} ${SECTION} ${DATE} ${VERSION} \"Debian Live Project\"|" ${MANPAGE}
done
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 227f2e9..7512bdd 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 05.06.2010 2.0~a5 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 2010\-06\-08 2.0~a6 "Debian Live Projekt"
.SH NAME
\fBlive\-config\fP \- System Konfiguration Skripte
@@ -74,7 +74,19 @@ Ermöglicht die Zeitzone des Systems einzustellen, zum Beispiel
.IP \fBlive\-config.utc\fP=\fByes\fP|no 4
Ermöglicht zu bestimmen, ob das System davon ausgehen soll, dass die
Hardwareuhr auf UTC gestellt ist oder nicht. Der Standard ist 'yes'.
-.IP "\fBlive\-config.hook\fP=\fIURL1\fP|\fIURL2\fP| ...|\fIURLn\fP" 4
+.IP \fBlive\-config.keyboard\-model\fP=\fITASTATUR_MODELL\fP 4
+Ermöglicht das Tastatur Modell zu bestimmen. Es ist kein Standardwert
+gesetzt.
+.IP \fBlive\-config.keyboard\-layout\fP=\fITASTATUR_LAYOUT\fP 4
+Ermöglicht das Tastatur Layout zu bestimmen. Es ist kein Standardwert
+gesetzt.
+.IP \fBlive\-config.keyboard\-variant\fP=\fITASTATUR_VARIANTE\fP 4
+Ermöglicht die Tastatur Variante zu bestimmen. Es ist kein Standardwert
+gesetzt.
+.IP \fBlive\-config.keyboard\-options\fP=\fITASTATUR_OPTIONEN\fP 4
+Ermöglicht die Tastatur Optionen zu bestimmen. Es ist kein Standardwert
+gesetzt.
+.IP "\fBlive\-config.hooks\fP=\fIURL1\fP|\fIURL2\fP| ...|\fIURLn\fP" 4
Ermöglicht eine oder mehrere beliebige Dateien herunterzuladen und
auszuführen. Die URLs müssen durch wget aufösbar sein und es müssen alle
Abhängigkeiten, die für das Ausführen der Dateien notwendig sind, bereits
@@ -90,9 +102,12 @@ einfache Benutzbarkeit.
.IP \fBlive\-config.noroot\fP 4
Schaltet die sudo und policykit Skripte ab, ein Benutzer kann keine root
Privilegien auf dem System mehr erlangen.
-.IP \fBlive\-config.noxlogin\fP 4
+.IP \fBlive\-config.nottyautologin\fP 4
+Schaltet den automatischen Login via TTY ab, dies beeinflusst den
+automatisch graphischen Login nicht.
+.IP \fBlive\-config.noxautologin\fP 4
Schaltet den automatischen Login via Display Manager ab, dies beeinflusst
-den automatischen tty Login.
+den automatischen tty Login nicht.
.SS Konfigurationsdateien
\fBlive\-config\fP kann durch Konfigurationsdateien konfiguriert (nicht aber
@@ -138,10 +153,48 @@ Diese Variable enspricht dem '\fBlive\-config.timezone\fP=\fIZEITZONE\fP'
Parameter.
.IP \fBLIVE_UTC\fP=\fByes\fP|no 4
Diese Variable enspricht dem '\fBlive\-config.utc\fP=\fByes\fP|no' Parameter.
-.IP "\fBLIVE_HOOK\fP=\fIURL1\fP|\fIURL2\fP| ... |\fIURLn\fP" 4
-Diese Variable enspricht dem '\fBlive\-config.hook\fP=\fIURL1\fP|\fIURL2\fP|
+.IP \fBLIVE_KEYBOARD_MODEL\fP=\fIKEYBOARD_MODEL\fP 4
+Diese Variable enspricht dem
+\&'\fBlive\-config.keyboard\-model\fP=\fITASTATUR_MODELL\fP' Parameter.
+.IP \fBLIVE_KEYBOARD_LAYOUT\fP=\fIKEYBOARD_LAYOUT\fP 4
+Diese Variable enspricht dem
+\&'\fBlive\-config.keyboard\-layout\fP=\fITASTATUR_LAYOUT\fP' Parameter.
+.IP \fBLIVE_KEYBOARD_VARIANT\fP=\fIKEYBOARD_VARIANT\fP 4
+Diese Variable enspricht dem
+\&'\fBlive\-config.keyboard\-variant\fP=\fITASTATUR_VARIANTE\fP' Parameter.
+.IP \fBLIVE_KEYBOARD_OPTIONS\fP=\fIKEYBOARD_OPTIONS\fP 4
+Diese Variable enspricht dem
+\&'\fBlive\-config.keyboard\-options\fP=\fITASTATUR_OPTIONEN\fP' Parameter.
+.IP "\fBLIVE_HOOKS\fP=\fIURL1\fP|\fIURL2\fP| ... |\fIURLn\fP" 4
+Diese Variable enspricht dem '\fBlive\-config.hooks\fP=\fIURL1\fP|\fIURL2\fP|
\&... |\fIURLn\fP' Parameter.
+.SH ANPASSUNG
+\fBlive\-config\fP kann sehr einfach angepasst werden für Downstream Projekte
+oder lokale Verwendung.
+
+.SS "Hinzufügen von neuen Konfigurationsskripten"
+Downstream Projekte können ihre Skripte in /lib/live/config ablegen und
+müssen nichts weiteres tun, die Skripte werden automatisch während des
+Startens ausgeführt.
+.PP
+Am Besten werden die Skripte in ein eigenes Debian Paket untergebracht. Ein
+Beispielpaket und \-skript befindet sich in
+/usr/share/doc/live\-config/examples.
+
+.SS "Entfernen von neuen Konfigurationsskripten"
+Es ist derzeit nicht möglich in einer vernünftigen Art und Weise Skripte zu
+entfernen ohne das ein lokal verändertes \fBlive\-config\fP Paket verwendet
+werden muss. Jedoch kann das selbe erreicht werden, indem bestimmte Skripte
+durch den live\-noconfig Mechanismus abgeschaltet werden, siehe oben. Um zu
+verhindern, dass die abzuschaltenden Skripte immer durch einen Boot
+Parameter angegeben werden müssen, kann eine Konfigurationsdatei verwendet
+werden, siehe oben.
+.PP
+Die Konfigurationsdateien für das Live System selber werden am Besten in
+einem eigenen Debian Paket untergebracht. Ein Beispielpaket und
+\-konfigurationsdatei befindet sich in /usr/share/doc/live\-config/examples.
+
.SH SKRIPTE
\fBlive\-config\fP enthält derzeit folgende Skripte in /lib/live/config.
@@ -165,6 +218,12 @@ konfiguriert Autologin in kdm.
konfiguriert Autologin in lxdm.
.IP \fBnodm\fP 4
konfiguriert Autologin in nodm.
+.IP "\fBconsole\-common\fP, console\-setup (lenny), \fBkeyboard\-configuration\fP (squeeze and newer)" 4
+konfiguriert die Tastatur.
+.IP \fBsysvinit\fP 4
+konfiguriert sysvinit.
+.IP \fBlogin\fP 4
+schaltet lastlog ab.
.IP \fBapport\fP 4
aktiviert apport.
.IP \fBgnome\-panel\-data\fP 4
@@ -193,7 +252,11 @@ räumt dem Benutzer Privilegien durch policykit ein.
erneuert SSL snake\-oil Zertifikate.
.IP \fBupdate\-notifier\fP 4
schaltet update\-notifier ab.
-.IP \fBhook\fP 4
+.IP \fBanacron\fP 4
+schaltet anacron aus.
+.IP \fButil\-linux\fP 4
+schaltet hwclock von util\-linux ab.
+.IP \fBhooks\fP 4
erlaubt beliebige Kommands von einem Skript auf dem Live Medium oder von
einem HTTP/FTP Server auszuführen.
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 96a9510..72b5674 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\-06\-05 2.0~a5 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2010\-06\-08 2.0~a6 "Debian Live Project"
.SH NAME
\fBlive\-config\fR \- System Configuration Scripts
@@ -23,36 +23,46 @@
.IP "\fBlive\-config\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
-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
+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
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" 4
All scripts are run, except the specified ones.
.SS Boot Parameters (options)
Some individual scripts can change their behaviour upon a boot parameter.
-.IP "\fBlive-config.hostname\fR=\fIHOSTNAME\fR" 4
+.IP "\fBlive\-config.hostname\fR=\fIHOSTNAME\fR" 4
Allows to set the hostname of the system. The default is 'debian'.
-.IP "\fBlive-config.username\fR=\fIUSERNAME\fR" 4
+.IP "\fBlive\-config.username\fR=\fIUSERNAME\fR" 4
Allows to set the username that gets created for autologin. The default is 'user'.
-.IP "\fBlive-config.user-fullname\fR=""\fIUSER FULLNAME\fR""" 4
+.IP "\fBlive\-config.user\-fullname\fR=""\fIUSER FULLNAME\fR""" 4
Allows to set the fullname of the users that gets created for autologin. The default is 'Debian Live user'.
-.IP "\fBlive-config.locales\fR=\fILOCALE\fR" 4
+.IP "\fBlive\-config.locales\fR=\fILOCALE\fR" 4
Allows to set the locale of the system, e.g. 'de_CH.UTF\-8'. The default is 'en_US.UTF\-8'. In case the selected locale is not already available on the system, it is automatically generated on the fly.
-.IP "\fBlive-config.timezone\fR=\fITIMEZONE\fR" 4
+.IP "\fBlive\-config.timezone\fR=\fITIMEZONE\fR" 4
Allows to set the timezone of the system, e.g. 'Europe/Zurich'. The default is 'UTC'.
-.IP "\fBlive-config.utc\fR=\fByes\fR|no" 4
+.IP "\fBlive\-config.utc\fR=\fByes\fR|no" 4
Allows to change if the system is assuming that the hardware clock is set to UTC or not. The default is 'yes'.
-.IP "\fBlive-config.hook\fR=\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR" 4
+.IP "\fBlive\-config.keyboard\-model\fR=\fIKEYBOARD_MODEL\fR" 4
+Allows to change the keyboard model. There is no default value set.
+.IP "\fBlive\-config.keyboard\-layout\fR=\fIKEYBOARD_LAYOUT\fR" 4
+Allows to change the keyboard layout. There is no default value set.
+.IP "\fBlive\-config.keyboard\-variant\fR=\fIKEYBOARD_VARIANT\fR" 4
+Allows to change the keyboard variant. There is no default value set.
+.IP "\fBlive\-config.keyboard\-options\fR=\fIKEYBOARD_OPTIONS\fR" 4
+Allows to change the keyboard options. There are no default value set.
+.IP "\fBlive\-config.hooks\fR=\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR" 4
Allows to fetch and execute one or more arbitrary files. Note that the URLs must be fetchable by wget, and that the files needs their dependencies, if any, already installed, e.g. if a python script should be executed the system needs python installed.
.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.
-.IP "\fBlive-config.noroot\fR" 4
+.IP "\fBlive\-config.noroot\fR" 4
Disables the sudo and policykit, the user cannot gain root privileges on the system.
-.IP "\fBlive-config.noxlogin\fR" 4
+.IP "\fBlive\-config.nottyautologin\fR" 4
+Disables the automatic login on the terminal, not affecting the graphical autologin.
+.IP "\fBlive\-config.noxautologin\fR" 4
Disables the automatic login with any display manager, not affecting tty autologin.
.SS Configuration Files
@@ -60,7 +70,7 @@ Disables the automatic login with any display manager, not affecting tty autolog
.PP
Configuration files can be placed either in the root filesystem itself (/etc/live/config.conf, /etc/live/config.conf.d/), or on the live media (live/config.conf, live/config.conf.d/). If both places are used for a certain option, the ones from the live media take precedence over the ones from the root filesystem.
.PP
-Although the configuration files placed in the conf.d directories do not require a particular name or suffix, it's suggest for consistency to either use 'vendor.conf' or 'project.conf' as a naming scheme (whereas 'vendor' or 'project' is replaced with the actual name, resulting in a filename like 'debian-eeepc.conf').
+Although the configuration files placed in the conf.d directories do not require a particular name or suffix, it's suggest for consistency to either use 'vendor.conf' or 'project.conf' as a naming scheme (whereas 'vendor' or 'project' is replaced with the actual name, resulting in a filename like 'debian\-eeepc.conf').
.IP "\fBLIVE_CONFIGS\fR=\fISCRIPT1\fR,\fISCRIPT2\fR, ... \fISCRIPTn\fR" 4
This variable equals the '\fBlive\-config\fR=\fISCRIPT1\fR,\fISCRIPT2\fR, ... \fISCRIPTn\fR' parameter.
@@ -71,22 +81,43 @@ This variable equals the '\fBlive\-config.hostname\fR=\fIHOSTAME\fR' parameter.
.IP "\fBLIVE_USERNAME\fR=\fIUSERNAME\fR" 4
This variable equals the '\fBlive\-config.username\fR=\fIUSERNAME\fR' parameter.
.IP "\fBLIVE_USER_FULLNAME\fR=""\fIUSER FULLNAME""\fR" 4
-This variable equals the '\fBlive\-config.user-fullname\fR="\fIUSER FULLNAME\fR"' parameter.
+This variable equals the '\fBlive\-config.user\-fullname\fR="\fIUSER FULLNAME\fR"' parameter.
.IP "\fBLIVE_LOCALES\fR=\fILOCALE\fR" 4
This variable equals the '\fBlive\-config.locales\fR=\fILOCALE\fR' parameter.
.IP "\fBLIVE_TIMEZONE\fR=\fITIMEZONE\fR" 4
This variable equals the '\fBlive\-config.timezone\fR=\fITIMEZONE\fR' parameter.
.IP "\fBLIVE_UTC\fR=\fByes\fR|no" 4
This variable equals the '\fBlive\-config.utc\fR=\fByes\fR|no' parameter.
-.IP "\fBLIVE_HOOK\fR=\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR" 4
-This variable equals the '\fBlive\-config.hook\fR=\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR' parameter.
+.IP "\fBLIVE_KEYBOARD_MODEL\fR=\fIKEYBOARD_MODEL\fR" 4
+This variable equals the '\fBlive\-config.keyboard\-model\fR=\fIKEYBOARD_MODEL\fR' parameter.
+.IP "\fBLIVE_KEYBOARD_LAYOUT\fR=\fIKEYBOARD_LAYOUT\fR" 4
+This variable equals the '\fBlive\-config.keyboard\-layout\fR=\fIKEYBOARD_LAYOUT\fR' parameter.
+.IP "\fBLIVE_KEYBOARD_VARIANT\fR=\fIKEYBOARD_VARIANT\fR" 4
+This variable equals the '\fBlive\-config.keyboard\-variant\fR=\fIKEYBOARD_VARIANT\fR' parameter.
+.IP "\fBLIVE_KEYBOARD_OPTIONS\fR=\fIKEYBOARD_OPTIONS\fR" 4
+This variable equals the '\fBlive\-config.keyboard\-options\fR=\fIKEYBOARD_OPTIONS\fR' parameter.
+.IP "\fBLIVE_HOOKS\fR=\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR" 4
+This variable equals the '\fBlive\-config.hooks\fR=\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR' parameter.
+
+.SH CUSTOMIZATION
+\fBlive\-config\fR can be easily customized for downstream projects or local usage.
+
+.SS Adding new config scripts
+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 boot.
+.PP
+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/examples.
+
+.SS Removing existing config scripts
+It's not really possible to remove scripts itself in a sane way yet without requiring to ship a locally modified \fBlive\-config\fR package. However, the same can be acchieved by disabling the respective scripts through the live\-noconfig mechanism, see above. To avoid to always need specifing disabled scripts through the boot parameter, a configuration file should be used, see above.
+.PP
+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 found in /usr/share/doc/live\-config/examples.
.SH SCRIPTS
\fBlive\-config\fR currently features the following scripts in /lib/live/config.
.IP "\fBhostname\fR" 4
configures /etc/hostname and /etc/hosts.
-.IP "\fBuser-setup\fR" 4
+.IP "\fBuser\-setup\fR" 4
adds an live user account.
.IP "\fBsudo\fR" 4
grants sudo privileges to the live user.
@@ -104,33 +135,43 @@ configures autologin in kdm.
configures autologin in lxdm.
.IP "\fBnodm\fR" 4
configures autologin in nodm.
+.IP "\fBconsole\-common\fR, console\-setup\fR (lenny), \fBkeyboard\-configuration\fR (squeeze and newer)" 4
+configures the keyboard.
+.IP "\fBsysvinit\fR" 4
+configures sysvinit.
+.IP "\fBlogin\fR" 4
+disables lastlog.
.IP "\fBapport\fR" 4
enables apport.
-.IP "\fBgnome-panel-data\fR" 4
+.IP "\fBgnome\-panel\-data\fR" 4
disables lock button for the screen.
-.IP "\fBgnome-power-manager\fR" 4
+.IP "\fBgnome\-power\-manager\fR" 4
disables hibernation.
-.IP "\fBgnome-screensaver\fR" 4
+.IP "\fBgnome\-screensaver\fR" 4
disables the screensaver locking the screen.
-.IP "\fBinitramfs-tools\fR" 4
-makes update-initramfs to also update the live media when using persistency.
+.IP "\fBinitramfs\-tools\fR" 4
+makes update\-initramfs to also update the live media when using persistency.
.IP "\fBkaboom\fR" 4
disables kde migration wizard (squeeze and newer).
-.IP "\fBkde-services\fR" 4
+.IP "\fBkde\-services\fR" 4
disables some unwanted KDE services (squeeze and newer).
.IP "\fBkpersonalizer\fR" 4
disables kde configuration wizard (lenny).
-.IP "\fBlive-installer-launcher\fR" 4
-adds live-installer-launcher on users desktop.
-.IP "\fBmodule-init-tools\fR" 4
+.IP "\fBlive\-installer\-launcher\fR" 4
+adds live\-installer\-launcher on users desktop.
+.IP "\fBmodule\-init\-tools\fR" 4
automatically load some modules on some architectures.
.IP "\fBpolicykit\fR" 4
grant user privilegies through policykit.
.IP "\fBsslcert\fR" 4
-regenerating ssl snake-oil certificates.
-.IP "\fBupdate-notifier\fR" 4
-disables update-notifier.
-.IP "\fBhook\fR" 4
+regenerating ssl snake\-oil certificates.
+.IP "\fBupdate\-notifier\fR" 4
+disables update\-notifier.
+.IP "\fBanacron\fR" 4
+disables anacron.
+.IP "\fButil-linux\fR" 4
+disables util-linux' hwclock.
+.IP "\fBhooks\fR" 4
allows to run arbitrary commands from a script placed on the live media or an http/ftp server.
.SH FILES
@@ -151,7 +192,7 @@ allows to run arbitrary commands from a script placed on the live media or an ht
More information about live\-config and the Debian Live project can be found on the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
.SH BUGS
-Bugs can be reported by submitting a bugreport for the live\-config package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Debian Live mailing list at <\fIdebian-live at lists.debian.org\fR>.
+Bugs can be reported by submitting a bugreport for the live\-config package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Debian Live mailing list at <\fIdebian\-live at lists.debian.org\fR>.
.SH AUTHOR
live\-config was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index bb6a4a2..fcd5594 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 2.0~a5\n"
-"POT-Creation-Date: 2010-06-05 14:08+0300\n"
+"Project-Id-Version: live-config 2.0~a6\n"
+"POT-Creation-Date: 2010-06-08 06: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"
@@ -23,15 +23,13 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
-#, no-wrap
-msgid "2010-06-05"
-msgstr "05.06.2010"
+msgid "2010-06-08"
+msgstr "08.06.2010"
#. type: TH
#: en/live-config.7:9
-#, no-wrap
-msgid "2.0~a5"
-msgstr "2.0~a5"
+msgid "2.0~a6"
+msgstr "2.0~a6"
#. type: TH
#: en/live-config.7:9
@@ -275,11 +273,63 @@ msgstr ""
#. type: IP
#: en/live-config.7:47
#, no-wrap
-msgid "B<live-config.hook>=I<URL1>|I<URL2>| ... |I<URLn>"
-msgstr "B<live-config.hook>=I<URL1>|I<URL2>| ...|I<URLn>"
+msgid "B<live-config.keyboard-model>=I<KEYBOARD_MODEL>"
+msgstr "B<live-config.keyboard-model>=I<TASTATUR_MODELL>"
#. type: Plain text
#: en/live-config.7:49
+msgid "Allows to change the keyboard model. There is no default value set."
+msgstr ""
+"Ermöglicht das Tastatur Modell zu bestimmen. Es ist kein Standardwert "
+"gesetzt."
+
+#. type: IP
+#: en/live-config.7:49
+#, no-wrap
+msgid "B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT>"
+msgstr "B<live-config.keyboard-layout>=I<TASTATUR_LAYOUT>"
+
+#. type: Plain text
+#: en/live-config.7:51
+msgid "Allows to change the keyboard layout. There is no default value set."
+msgstr ""
+"Ermöglicht das Tastatur Layout zu bestimmen. Es ist kein Standardwert "
+"gesetzt."
+
+#. type: IP
+#: en/live-config.7:51
+#, no-wrap
+msgid "B<live-config.keyboard-variant>=I<KEYBOARD_VARIANT>"
+msgstr "B<live-config.keyboard-variant>=I<TASTATUR_VARIANTE>"
+
+#. type: Plain text
+#: en/live-config.7:53
+msgid "Allows to change the keyboard variant. There is no default value set."
+msgstr ""
+"Ermöglicht die Tastatur Variante zu bestimmen. Es ist kein Standardwert "
+"gesetzt."
+
+#. type: IP
+#: en/live-config.7:53
+#, no-wrap
+msgid "B<live-config.keyboard-options>=I<KEYBOARD_OPTIONS>"
+msgstr "B<live-config.keyboard-options>=I<TASTATUR_OPTIONEN>"
+
+#. type: Plain text
+#: en/live-config.7:55
+msgid "Allows to change the keyboard options. There are no default value set."
+msgstr ""
+"Ermöglicht die Tastatur Optionen zu bestimmen. Es ist kein Standardwert "
+"gesetzt."
+
+#. type: IP
+#: en/live-config.7:55
+#, no-wrap
+msgid "B<live-config.hooks>=I<URL1>|I<URL2>| ... |I<URLn>"
+msgstr "B<live-config.hooks>=I<URL1>|I<URL2>| ...|I<URLn>"
+
+#. type: Plain text
+#: en/live-config.7:57
msgid ""
"Allows to fetch and execute one or more arbitrary files. Note that the URLs "
"must be fetchable by wget, and that the files needs their dependencies, if "
@@ -293,13 +343,13 @@ msgstr ""
"dem System installiert sein."
#. type: SS
-#: en/live-config.7:50
+#: en/live-config.7:58
#, no-wrap
msgid "Boot Parameters (shortcuts)"
msgstr "Boot Parameter (Abkürzungen)"
#. type: Plain text
-#: en/live-config.7:52
+#: en/live-config.7:60
msgid ""
"For some common use cases where it would require to combine several "
"individual parameters, B<live-config> provides shortcuts. This allows both "
@@ -311,13 +361,13 @@ msgstr ""
"einfache Benutzbarkeit."
#. type: IP
-#: en/live-config.7:53
+#: en/live-config.7:61
#, no-wrap
msgid "B<live-config.noroot>"
msgstr "B<live-config.noroot>"
#. type: Plain text
-#: en/live-config.7:55
+#: en/live-config.7:63
msgid ""
"Disables the sudo and policykit, the user cannot gain root privileges on the "
"system."
@@ -326,28 +376,43 @@ msgstr ""
"Privilegien auf dem System mehr erlangen."
#. type: IP
-#: en/live-config.7:55
+#: en/live-config.7:63
#, no-wrap
-msgid "B<live-config.noxlogin>"
-msgstr "B<live-config.noxlogin>"
+msgid "B<live-config.nottyautologin>"
+msgstr "B<live-config.nottyautologin>"
#. type: Plain text
-#: en/live-config.7:57
+#: en/live-config.7:65
+msgid ""
+"Disables the automatic login on the terminal, not affecting the graphical "
+"autologin."
+msgstr ""
+"Schaltet den automatischen Login via TTY ab, dies beeinflusst den "
+"automatisch graphischen Login nicht."
+
+#. type: IP
+#: en/live-config.7:65
+#, no-wrap
+msgid "B<live-config.noxautologin>"
+msgstr "B<live-config.noxautologin>"
+
+#. type: Plain text
+#: en/live-config.7:67
msgid ""
"Disables the automatic login with any display manager, not affecting tty "
"autologin."
msgstr ""
"Schaltet den automatischen Login via Display Manager ab, dies beeinflusst "
-"den automatischen tty Login."
+"den automatischen tty Login nicht."
#. type: SS
-#: en/live-config.7:58
+#: en/live-config.7:68
#, no-wrap
msgid "Configuration Files"
msgstr "Konfigurationsdateien"
#. type: Plain text
-#: en/live-config.7:60
+#: en/live-config.7:70
msgid ""
"B<live-config> can be configured (but not activated) through configuration "
"files. Everything but the shortcuts that can be configured with a boot "
@@ -363,7 +428,7 @@ msgstr ""
"aktivieren."
#. type: Plain text
-#: en/live-config.7:62
+#: en/live-config.7:72
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/"
@@ -378,7 +443,7 @@ msgstr ""
"Live Medium dem der im Root Dateisystem enthaltenen vor."
#. type: Plain text
-#: en/live-config.7:64
+#: en/live-config.7:74
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 "
@@ -394,13 +459,13 @@ msgstr ""
"'debian-eeepc.conf')."
#. type: IP
-#: en/live-config.7:65
+#: en/live-config.7:75
#, 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:67
+#: en/live-config.7:77
msgid ""
"This variable equals the 'B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
@@ -409,13 +474,13 @@ msgstr ""
"I<SKRIPTn>' Parameter."
#. type: IP
-#: en/live-config.7:67
+#: en/live-config.7:77
#, 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:69
+#: en/live-config.7:79
msgid ""
"This variable equals the 'B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
@@ -424,13 +489,13 @@ msgstr ""
"I<SKRIPTn>' Parameter."
#. type: IP
-#: en/live-config.7:69
+#: en/live-config.7:79
#, no-wrap
msgid "B<LIVE_HOSTNAME>=I<HOSTNAME>"
msgstr "B<LIVE_HOSTNAME>=I<RECHNERNAME>"
#. type: Plain text
-#: en/live-config.7:71
+#: en/live-config.7:81
msgid ""
"This variable equals the 'B<live-config.hostname>=I<HOSTAME>' parameter."
msgstr ""
@@ -438,13 +503,13 @@ msgstr ""
"Parameter."
#. type: IP
-#: en/live-config.7:71
+#: en/live-config.7:81
#, no-wrap
msgid "B<LIVE_USERNAME>=I<USERNAME>"
msgstr "B<LIVE_USERNAME>=I<BENUTZERNAME>"
#. type: Plain text
-#: en/live-config.7:73
+#: en/live-config.7:83
msgid ""
"This variable equals the 'B<live-config.username>=I<USERNAME>' parameter."
msgstr ""
@@ -452,13 +517,13 @@ msgstr ""
"Parameter."
#. type: IP
-#: en/live-config.7:73
+#: en/live-config.7:83
#, 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:75
+#: en/live-config.7:85
msgid ""
"This variable equals the 'B<live-config.user-fullname>=\"I<USER FULLNAME>\"' "
"parameter."
@@ -467,232 +532,403 @@ msgstr ""
"BENUTZERNAME>\"' Parameter."
#. type: IP
-#: en/live-config.7:75
+#: en/live-config.7:85
#, no-wrap
msgid "B<LIVE_LOCALES>=I<LOCALE>"
msgstr "B<LIVE_LOCALES>=I<GEBIETSSCHEMA>"
#. type: Plain text
-#: en/live-config.7:77
+#: en/live-config.7:87
msgid "This variable equals the 'B<live-config.locales>=I<LOCALE>' parameter."
msgstr ""
"Diese Variable enspricht dem 'B<live-config.locales>=I<GEBIETSSCHEMA>' "
"Parameter."
#. type: IP
-#: en/live-config.7:77
+#: en/live-config.7:87
#, no-wrap
msgid "B<LIVE_TIMEZONE>=I<TIMEZONE>"
msgstr "B<LIVE_TIMEZONE>=I<ZEITZONE>"
#. type: Plain text
-#: en/live-config.7:79
+#: en/live-config.7:89
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:79
+#: en/live-config.7:89
#, no-wrap
msgid "B<LIVE_UTC>=B<yes>|no"
msgstr "B<LIVE_UTC>=B<yes>|no"
#. type: Plain text
-#: en/live-config.7:81
+#: en/live-config.7:91
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:81
+#: en/live-config.7:91
#, no-wrap
-msgid "B<LIVE_HOOK>=I<URL1>|I<URL2>| ... |I<URLn>"
-msgstr "B<LIVE_HOOK>=I<URL1>|I<URL2>| ... |I<URLn>"
+msgid "B<LIVE_KEYBOARD_MODEL>=I<KEYBOARD_MODEL>"
+msgstr ""
#. type: Plain text
-#: en/live-config.7:83
+#: en/live-config.7:93
+msgid ""
+"This variable equals the 'B<live-config.keyboard-model>=I<KEYBOARD_MODEL>' "
+"parameter."
+msgstr ""
+"Diese Variable enspricht dem 'B<live-config.keyboard-"
+"model>=I<TASTATUR_MODELL>' Parameter."
+
+#. type: IP
+#: en/live-config.7:93
+#, no-wrap
+msgid "B<LIVE_KEYBOARD_LAYOUT>=I<KEYBOARD_LAYOUT>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:95
msgid ""
-"This variable equals the 'B<live-config.hook>=I<URL1>|I<URL2>| ... |I<URLn>' "
+"This variable equals the 'B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT>' "
"parameter."
msgstr ""
-"Diese Variable enspricht dem 'B<live-config.hook>=I<URL1>|I<URL2>| ... |"
+"Diese Variable enspricht dem 'B<live-config.keyboard-"
+"layout>=I<TASTATUR_LAYOUT>' Parameter."
+
+#. type: IP
+#: en/live-config.7:95
+#, no-wrap
+msgid "B<LIVE_KEYBOARD_VARIANT>=I<KEYBOARD_VARIANT>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:97
+msgid ""
+"This variable equals the 'B<live-config.keyboard-"
+"variant>=I<KEYBOARD_VARIANT>' parameter."
+msgstr ""
+"Diese Variable enspricht dem 'B<live-config.keyboard-"
+"variant>=I<TASTATUR_VARIANTE>' Parameter."
+
+#. type: IP
+#: en/live-config.7:97
+#, no-wrap
+msgid "B<LIVE_KEYBOARD_OPTIONS>=I<KEYBOARD_OPTIONS>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:99
+msgid ""
+"This variable equals the 'B<live-config.keyboard-"
+"options>=I<KEYBOARD_OPTIONS>' parameter."
+msgstr ""
+"Diese Variable enspricht dem 'B<live-config.keyboard-"
+"options>=I<TASTATUR_OPTIONEN>' Parameter."
+
+#. type: IP
+#: en/live-config.7:99
+#, no-wrap
+msgid "B<LIVE_HOOKS>=I<URL1>|I<URL2>| ... |I<URLn>"
+msgstr "B<LIVE_HOOKS>=I<URL1>|I<URL2>| ... |I<URLn>"
+
+#. type: Plain text
+#: en/live-config.7:101
+msgid ""
+"This variable equals the 'B<live-config.hooks>=I<URL1>|I<URL2>| ... |"
+"I<URLn>' parameter."
+msgstr ""
+"Diese Variable enspricht dem 'B<live-config.hooks>=I<URL1>|I<URL2>| ... |"
"I<URLn>' Parameter."
#. type: SH
-#: en/live-config.7:84
+#: en/live-config.7:102
+#, no-wrap
+msgid "CUSTOMIZATION"
+msgstr "ANPASSUNG"
+
+#. type: Plain text
+#: en/live-config.7:104
+msgid ""
+"B<live-config> can be easily customized for downstream projects or local "
+"usage."
+msgstr ""
+"B<live-config> kann sehr einfach angepasst werden für Downstream Projekte "
+"oder lokale Verwendung."
+
+#. type: SS
+#: en/live-config.7:105
+#, no-wrap
+msgid "Adding new config scripts"
+msgstr "Hinzufügen von neuen Konfigurationsskripten"
+
+#. type: Plain text
+#: en/live-config.7:107
+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 "
+"boot."
+msgstr ""
+"Downstream Projekte können ihre Skripte in /lib/live/config ablegen und "
+"müssen nichts weiteres tun, die Skripte werden automatisch während des "
+"Startens ausgeführt."
+
+#. type: Plain text
+#: en/live-config.7:109
+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/"
+"examples."
+msgstr ""
+"Am Besten werden die Skripte in ein eigenes Debian Paket untergebracht. Ein "
+"Beispielpaket und -skript befindet sich in /usr/share/doc/live-config/"
+"examples."
+
+#. type: SS
+#: en/live-config.7:110
+#, no-wrap
+msgid "Removing existing config scripts"
+msgstr "Entfernen von neuen Konfigurationsskripten"
+
+#. type: Plain text
+#: en/live-config.7:112
+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 "
+"same can be acchieved by disabling the respective scripts through the live-"
+"noconfig mechanism, see above. To avoid to always need specifing disabled "
+"scripts through the boot parameter, a configuration file should be used, see "
+"above."
+msgstr ""
+"Es ist derzeit nicht möglich in einer vernünftigen Art und Weise Skripte zu "
+"entfernen ohne das ein lokal verändertes B<live-config> Paket verwendet "
+"werden muss. Jedoch kann das selbe erreicht werden, indem bestimmte Skripte "
+"durch den live-noconfig Mechanismus abgeschaltet werden, siehe oben. Um zu "
+"verhindern, dass die abzuschaltenden Skripte immer durch einen Boot "
+"Parameter angegeben werden müssen, kann eine Konfigurationsdatei verwendet "
+"werden, siehe oben."
+
+#. type: Plain text
+#: en/live-config.7:114
+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 "
+"found in /usr/share/doc/live-config/examples."
+msgstr ""
+"Die Konfigurationsdateien für das Live System selber werden am Besten in "
+"einem eigenen Debian Paket untergebracht. Ein Beispielpaket und -"
+"konfigurationsdatei befindet sich in /usr/share/doc/live-config/examples."
+
+#. type: SH
+#: en/live-config.7:115
#, no-wrap
msgid "SCRIPTS"
msgstr "SKRIPTE"
#. type: Plain text
-#: en/live-config.7:86
+#: en/live-config.7:117
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:87
+#: en/live-config.7:118
#, no-wrap
msgid "B<hostname>"
msgstr "B<hostname>"
#. type: Plain text
-#: en/live-config.7:89
+#: en/live-config.7:120
msgid "configures /etc/hostname and /etc/hosts."
msgstr "konfiguriert /etc/hostname und /etc/hosts."
#. type: IP
-#: en/live-config.7:89
+#: en/live-config.7:120
#, no-wrap
msgid "B<user-setup>"
msgstr "B<user-setup>"
#. type: Plain text
-#: en/live-config.7:91
+#: en/live-config.7:122
msgid "adds an live user account."
msgstr "fügt das Live Benutzerkonto hinzu."
#. type: IP
-#: en/live-config.7:91
+#: en/live-config.7:122
#, no-wrap
msgid "B<sudo>"
msgstr "B<sudo>"
#. type: Plain text
-#: en/live-config.7:93
+#: en/live-config.7:124
msgid "grants sudo privileges to the live user."
msgstr "räumt dem Live Benutzer sudo Privilegien ein."
#. type: IP
-#: en/live-config.7:93
+#: en/live-config.7:124
#, no-wrap
msgid "B<locales>"
msgstr "B<locales>"
#. type: Plain text
-#: en/live-config.7:95
+#: en/live-config.7:126
msgid "configures locales."
msgstr "konfiguriert locales."
#. type: IP
-#: en/live-config.7:95
+#: en/live-config.7:126
#, no-wrap
msgid "B<tzdata>"
msgstr "B<tzdata>"
#. type: Plain text
-#: en/live-config.7:97
+#: en/live-config.7:128
msgid "configures /etc/timezone."
msgstr "konfiguriert /etc/timezone."
#. type: IP
-#: en/live-config.7:97
+#: en/live-config.7:128
#, no-wrap
msgid "B<gdm>"
msgstr "B<gdm>"
#. type: Plain text
-#: en/live-config.7:99
+#: en/live-config.7:130
msgid "configures autologin in gdm (lenny)."
msgstr "konfiguriert Autologin in gdm (lenny)."
#. type: IP
-#: en/live-config.7:99
+#: en/live-config.7:130
#, no-wrap
msgid "B<gdm3>"
msgstr "B<gdm3>"
#. type: Plain text
-#: en/live-config.7:101
+#: en/live-config.7:132
msgid "configures autologin in gdm3 (squeeze and newer)."
msgstr "konfiguriert Autologin in gdm3 (squeeze und neuer)."
#. type: IP
-#: en/live-config.7:101
+#: en/live-config.7:132
#, no-wrap
msgid "B<kdm>"
msgstr "B<kdm>"
#. type: Plain text
-#: en/live-config.7:103
+#: en/live-config.7:134
msgid "configures autologin in kdm."
msgstr "konfiguriert Autologin in kdm."
#. type: IP
-#: en/live-config.7:103
+#: en/live-config.7:134
#, no-wrap
msgid "B<lxdm>"
msgstr "B<lxdm>"
#. type: Plain text
-#: en/live-config.7:105
+#: en/live-config.7:136
msgid "configures autologin in lxdm."
msgstr "konfiguriert Autologin in lxdm."
#. type: IP
-#: en/live-config.7:105
+#: en/live-config.7:136
#, no-wrap
msgid "B<nodm>"
msgstr "B<nodm>"
#. type: Plain text
-#: en/live-config.7:107
+#: en/live-config.7:138
msgid "configures autologin in nodm."
msgstr "konfiguriert Autologin in nodm."
#. type: IP
-#: en/live-config.7:107
+#: en/live-config.7:138
+#, no-wrap
+msgid "B<console-common>, console-setup (lenny), B<keyboard-configuration> (squeeze and newer)"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:140
+msgid "configures the keyboard."
+msgstr "konfiguriert die Tastatur."
+
+#. type: IP
+#: en/live-config.7:140
+#, no-wrap
+msgid "B<sysvinit>"
+msgstr "B<sysvinit>"
+
+#. type: Plain text
+#: en/live-config.7:142
+msgid "configures sysvinit."
+msgstr "konfiguriert sysvinit."
+
+#. type: IP
+#: en/live-config.7:142
+#, no-wrap
+msgid "B<login>"
+msgstr "B<login>"
+
+#. type: Plain text
+#: en/live-config.7:144
+msgid "disables lastlog."
+msgstr "schaltet lastlog ab."
+
+#. type: IP
+#: en/live-config.7:144
#, no-wrap
msgid "B<apport>"
msgstr "B<apport>"
#. type: Plain text
-#: en/live-config.7:109
+#: en/live-config.7:146
msgid "enables apport."
msgstr "aktiviert apport."
#. type: IP
-#: en/live-config.7:109
+#: en/live-config.7:146
#, no-wrap
msgid "B<gnome-panel-data>"
msgstr "B<gnome-panel-data>"
#. type: Plain text
-#: en/live-config.7:111
+#: en/live-config.7:148
msgid "disables lock button for the screen."
msgstr "entfernt den Sperrknopf für den Bildschirm."
#. type: IP
-#: en/live-config.7:111
+#: en/live-config.7:148
#, no-wrap
msgid "B<gnome-power-manager>"
msgstr "B<gnome-power-manager>"
#. type: Plain text
-#: en/live-config.7:113
+#: en/live-config.7:150
msgid "disables hibernation."
msgstr "verhindert Hibernation."
#. type: IP
-#: en/live-config.7:113
+#: en/live-config.7:150
#, no-wrap
msgid "B<gnome-screensaver>"
msgstr "B<gnome-screensaver>"
#. type: Plain text
-#: en/live-config.7:115
+#: en/live-config.7:152
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:115
+#: en/live-config.7:152
#, no-wrap
msgid "B<initramfs-tools>"
msgstr "B<initramfs-tools>"
#. type: Plain text
-#: en/live-config.7:117
+#: en/live-config.7:154
msgid ""
"makes update-initramfs to also update the live media when using persistency."
msgstr ""
@@ -700,101 +936,123 @@ msgstr ""
"benutzt wird."
#. type: IP
-#: en/live-config.7:117
+#: en/live-config.7:154
#, no-wrap
msgid "B<kaboom>"
msgstr "B<kaboom>"
#. type: Plain text
-#: en/live-config.7:119
+#: en/live-config.7:156
msgid "disables kde migration wizard (squeeze and newer)."
msgstr "schaltet den KDE Migration Wizard ab (squeeze und neuer)."
#. type: IP
-#: en/live-config.7:119
+#: en/live-config.7:156
#, no-wrap
msgid "B<kde-services>"
msgstr "B<kde-services>"
#. type: Plain text
-#: en/live-config.7:121
+#: en/live-config.7:158
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:121
+#: en/live-config.7:158
#, no-wrap
msgid "B<kpersonalizer>"
msgstr "B<kpersonalizer>"
#. type: Plain text
-#: en/live-config.7:123
+#: en/live-config.7:160
msgid "disables kde configuration wizard (lenny)."
msgstr "schaltet den KDE Configuration Wizard ab (lenny)."
#. type: IP
-#: en/live-config.7:123
+#: en/live-config.7:160
#, no-wrap
msgid "B<live-installer-launcher>"
msgstr "B<live-installer-launcher>"
#. type: Plain text
-#: en/live-config.7:125
+#: en/live-config.7:162
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:125
+#: en/live-config.7:162
#, no-wrap
msgid "B<module-init-tools>"
msgstr "B<module-init-tools>"
#. type: Plain text
-#: en/live-config.7:127
+#: en/live-config.7:164
msgid "automatically load some modules on some architectures."
msgstr "lädt automatisch gewisse Module auf bestimmten Architekturen."
#. type: IP
-#: en/live-config.7:127
+#: en/live-config.7:164
#, no-wrap
msgid "B<policykit>"
msgstr "B<policykit>"
#. type: Plain text
-#: en/live-config.7:129
+#: en/live-config.7:166
msgid "grant user privilegies through policykit."
msgstr "räumt dem Benutzer Privilegien durch policykit ein."
#. type: IP
-#: en/live-config.7:129
+#: en/live-config.7:166
#, no-wrap
msgid "B<sslcert>"
msgstr "B<sslcert>"
#. type: Plain text
-#: en/live-config.7:131
+#: en/live-config.7:168
msgid "regenerating ssl snake-oil certificates."
msgstr "erneuert SSL snake-oil Zertifikate."
#. type: IP
-#: en/live-config.7:131
+#: en/live-config.7:168
#, no-wrap
msgid "B<update-notifier>"
msgstr "B<update-notifier>"
#. type: Plain text
-#: en/live-config.7:133
+#: en/live-config.7:170
msgid "disables update-notifier."
msgstr "schaltet update-notifier ab."
#. type: IP
-#: en/live-config.7:133
+#: en/live-config.7:170
+#, no-wrap
+msgid "B<anacron>"
+msgstr "B<anacron>"
+
+#. type: Plain text
+#: en/live-config.7:172
+msgid "disables anacron."
+msgstr "schaltet anacron aus."
+
+#. type: IP
+#: en/live-config.7:172
+#, no-wrap
+msgid "B<util-linux>"
+msgstr "B<util-linux>"
+
+#. type: Plain text
+#: en/live-config.7:174
+msgid "disables util-linux' hwclock."
+msgstr "schaltet hwclock von util-linux ab."
+
+#. type: IP
+#: en/live-config.7:174
#, no-wrap
-msgid "B<hook>"
-msgstr "B<hook>"
+msgid "B<hooks>"
+msgstr "B<hooks>"
#. type: Plain text
-#: en/live-config.7:135
+#: en/live-config.7:176
msgid ""
"allows to run arbitrary commands from a script placed on the live media or "
"an http/ftp server."
@@ -803,77 +1061,77 @@ msgstr ""
"einem HTTP/FTP Server auszuführen."
#. type: SH
-#: en/live-config.7:136
+#: en/live-config.7:177
#, no-wrap
msgid "FILES"
msgstr "DATEIEN"
#. type: IP
-#: en/live-config.7:137
+#: en/live-config.7:178
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr "B</etc/live/config.conf>"
#. type: IP
-#: en/live-config.7:138
+#: en/live-config.7:179
#, no-wrap
msgid "B</etc/live/config.conf.d/>"
msgstr "B</etc/live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:139
+#: en/live-config.7:180
#, no-wrap
msgid "B<live/config.conf>"
msgstr "B<live/config.conf>"
#. type: IP
-#: en/live-config.7:140
+#: en/live-config.7:181
#, no-wrap
msgid "B<live/config.conf.d/>"
msgstr "B<live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:141
+#: en/live-config.7:182
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr "B</lib/live/config.sh>"
#. type: IP
-#: en/live-config.7:142
+#: en/live-config.7:183
#, no-wrap
msgid "B</lib/live/config/>"
msgstr "B</lib/live/config/>"
#. type: IP
-#: en/live-config.7:143
+#: en/live-config.7:184
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr "B</var/lib/live/config/>"
#. type: SH
-#: en/live-config.7:145
+#: en/live-config.7:186
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-config.7:147
+#: en/live-config.7:188
msgid "I<live-boot>(7)"
msgstr "I<live-boot>(7)"
#. type: Plain text
-#: en/live-config.7:149
+#: en/live-config.7:190
msgid "I<live-helper>(7)"
msgstr "I<live-helper>(7)"
#. type: SH
-#: en/live-config.7:150
+#: en/live-config.7:191
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-config.7:152
+#: en/live-config.7:193
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 "
@@ -884,13 +1142,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-config.7:153
+#: en/live-config.7:194
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-config.7:155
+#: en/live-config.7:196
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 "
@@ -904,13 +1162,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-config.7:156
+#: en/live-config.7:197
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-config.7:157
+#: en/live-config.7:198
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 3b60013..e9acf88 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-06-05 14:08+0300\n"
+"POT-Creation-Date: 2010-06-08 06:00+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -24,13 +24,13 @@ msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-06-05"
+msgid "2010-06-08"
msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0~a5"
+msgid "2.0~a6"
msgstr ""
#. type: TH
@@ -237,11 +237,55 @@ msgstr ""
#. type: IP
#: en/live-config.7:47
#, no-wrap
-msgid "B<live-config.hook>=I<URL1>|I<URL2>| ... |I<URLn>"
+msgid "B<live-config.keyboard-model>=I<KEYBOARD_MODEL>"
msgstr ""
#. type: Plain text
#: en/live-config.7:49
+msgid "Allows to change the keyboard model. There is no default value set."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:49
+#, no-wrap
+msgid "B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:51
+msgid "Allows to change the keyboard layout. There is no default value set."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:51
+#, no-wrap
+msgid "B<live-config.keyboard-variant>=I<KEYBOARD_VARIANT>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:53
+msgid "Allows to change the keyboard variant. There is no default value set."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:53
+#, no-wrap
+msgid "B<live-config.keyboard-options>=I<KEYBOARD_OPTIONS>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:55
+msgid "Allows to change the keyboard options. There are no default value set."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:55
+#, no-wrap
+msgid "B<live-config.hooks>=I<URL1>|I<URL2>| ... |I<URLn>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:57
msgid ""
"Allows to fetch and execute one or more arbitrary files. Note that the URLs "
"must be fetchable by wget, and that the files needs their dependencies, if "
@@ -250,13 +294,13 @@ msgid ""
msgstr ""
#. type: SS
-#: en/live-config.7:50
+#: en/live-config.7:58
#, no-wrap
msgid "Boot Parameters (shortcuts)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:52
+#: en/live-config.7:60
msgid ""
"For some common use cases where it would require to combine several "
"individual parameters, B<live-config> provides shortcuts. This allows both "
@@ -264,39 +308,52 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-config.7:53
+#: en/live-config.7:61
#, no-wrap
msgid "B<live-config.noroot>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:55
+#: en/live-config.7:63
msgid ""
"Disables the sudo and policykit, the user cannot gain root privileges on the "
"system."
msgstr ""
#. type: IP
-#: en/live-config.7:55
+#: en/live-config.7:63
#, no-wrap
-msgid "B<live-config.noxlogin>"
+msgid "B<live-config.nottyautologin>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:57
+#: en/live-config.7:65
+msgid ""
+"Disables the automatic login on the terminal, not affecting the graphical "
+"autologin."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:65
+#, no-wrap
+msgid "B<live-config.noxautologin>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:67
msgid ""
"Disables the automatic login with any display manager, not affecting tty "
"autologin."
msgstr ""
#. type: SS
-#: en/live-config.7:58
+#: en/live-config.7:68
#, no-wrap
msgid "Configuration Files"
msgstr ""
#. type: Plain text
-#: en/live-config.7:60
+#: en/live-config.7:70
msgid ""
"B<live-config> can be configured (but not activated) through configuration "
"files. Everything but the shortcuts that can be configured with a boot "
@@ -306,7 +363,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:62
+#: en/live-config.7:72
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/"
@@ -316,7 +373,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-config.7:64
+#: en/live-config.7:74
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 "
@@ -326,466 +383,633 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-config.7:65
+#: en/live-config.7:75
#, no-wrap
msgid "B<LIVE_CONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:67
+#: en/live-config.7:77
msgid ""
"This variable equals the 'B<live-config>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:67
+#: en/live-config.7:77
#, no-wrap
msgid "B<LIVE_NOCONFIGS>=I<SCRIPT1>,I<SCRIPT2>, ... I<SCRIPTn>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:69
+#: en/live-config.7:79
msgid ""
"This variable equals the 'B<live-noconfig>=I<SCRIPT1>,I<SCRIPT2>, ... "
"I<SCRIPTn>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:69
+#: en/live-config.7:79
#, no-wrap
msgid "B<LIVE_HOSTNAME>=I<HOSTNAME>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:71
+#: en/live-config.7:81
msgid ""
"This variable equals the 'B<live-config.hostname>=I<HOSTAME>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:71
+#: en/live-config.7:81
#, no-wrap
msgid "B<LIVE_USERNAME>=I<USERNAME>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:73
+#: en/live-config.7:83
msgid ""
"This variable equals the 'B<live-config.username>=I<USERNAME>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:73
+#: en/live-config.7:83
#, no-wrap
msgid "B<LIVE_USER_FULLNAME>=\"I<USER FULLNAME\">"
msgstr ""
#. type: Plain text
-#: en/live-config.7:75
+#: en/live-config.7:85
msgid ""
"This variable equals the 'B<live-config.user-fullname>=\"I<USER FULLNAME>\"' "
"parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:75
+#: en/live-config.7:85
#, no-wrap
msgid "B<LIVE_LOCALES>=I<LOCALE>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:77
+#: en/live-config.7:87
msgid "This variable equals the 'B<live-config.locales>=I<LOCALE>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:77
+#: en/live-config.7:87
#, no-wrap
msgid "B<LIVE_TIMEZONE>=I<TIMEZONE>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:79
+#: en/live-config.7:89
msgid ""
"This variable equals the 'B<live-config.timezone>=I<TIMEZONE>' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:79
+#: en/live-config.7:89
#, no-wrap
msgid "B<LIVE_UTC>=B<yes>|no"
msgstr ""
#. type: Plain text
-#: en/live-config.7:81
+#: en/live-config.7:91
msgid "This variable equals the 'B<live-config.utc>=B<yes>|no' parameter."
msgstr ""
#. type: IP
-#: en/live-config.7:81
+#: en/live-config.7:91
#, no-wrap
-msgid "B<LIVE_HOOK>=I<URL1>|I<URL2>| ... |I<URLn>"
+msgid "B<LIVE_KEYBOARD_MODEL>=I<KEYBOARD_MODEL>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:83
+#: en/live-config.7:93
+msgid ""
+"This variable equals the 'B<live-config.keyboard-model>=I<KEYBOARD_MODEL>' "
+"parameter."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:93
+#, no-wrap
+msgid "B<LIVE_KEYBOARD_LAYOUT>=I<KEYBOARD_LAYOUT>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:95
msgid ""
-"This variable equals the 'B<live-config.hook>=I<URL1>|I<URL2>| ... |I<URLn>' "
+"This variable equals the 'B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT>' "
"parameter."
msgstr ""
+#. type: IP
+#: en/live-config.7:95
+#, no-wrap
+msgid "B<LIVE_KEYBOARD_VARIANT>=I<KEYBOARD_VARIANT>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:97
+msgid ""
+"This variable equals the 'B<live-config.keyboard-"
+"variant>=I<KEYBOARD_VARIANT>' parameter."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:97
+#, no-wrap
+msgid "B<LIVE_KEYBOARD_OPTIONS>=I<KEYBOARD_OPTIONS>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:99
+msgid ""
+"This variable equals the 'B<live-config.keyboard-"
+"options>=I<KEYBOARD_OPTIONS>' parameter."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:99
+#, no-wrap
+msgid "B<LIVE_HOOKS>=I<URL1>|I<URL2>| ... |I<URLn>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:101
+msgid ""
+"This variable equals the 'B<live-config.hooks>=I<URL1>|I<URL2>| ... |"
+"I<URLn>' parameter."
+msgstr ""
+
+#. type: SH
+#: en/live-config.7:102
+#, no-wrap
+msgid "CUSTOMIZATION"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:104
+msgid ""
+"B<live-config> can be easily customized for downstream projects or local "
+"usage."
+msgstr ""
+
+#. type: SS
+#: en/live-config.7:105
+#, no-wrap
+msgid "Adding new config scripts"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:107
+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 "
+"boot."
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:109
+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/"
+"examples."
+msgstr ""
+
+#. type: SS
+#: en/live-config.7:110
+#, no-wrap
+msgid "Removing existing config scripts"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:112
+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 "
+"same can be acchieved by disabling the respective scripts through the live-"
+"noconfig mechanism, see above. To avoid to always need specifing disabled "
+"scripts through the boot parameter, a configuration file should be used, see "
+"above."
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:114
+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 "
+"found in /usr/share/doc/live-config/examples."
+msgstr ""
+
#. type: SH
-#: en/live-config.7:84
+#: en/live-config.7:115
#, no-wrap
msgid "SCRIPTS"
msgstr ""
#. type: Plain text
-#: en/live-config.7:86
+#: en/live-config.7:117
msgid ""
"B<live-config> currently features the following scripts in /lib/live/config."
msgstr ""
#. type: IP
-#: en/live-config.7:87
+#: en/live-config.7:118
#, no-wrap
msgid "B<hostname>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:89
+#: en/live-config.7:120
msgid "configures /etc/hostname and /etc/hosts."
msgstr ""
#. type: IP
-#: en/live-config.7:89
+#: en/live-config.7:120
#, no-wrap
msgid "B<user-setup>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:91
+#: en/live-config.7:122
msgid "adds an live user account."
msgstr ""
#. type: IP
-#: en/live-config.7:91
+#: en/live-config.7:122
#, no-wrap
msgid "B<sudo>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:93
+#: en/live-config.7:124
msgid "grants sudo privileges to the live user."
msgstr ""
#. type: IP
-#: en/live-config.7:93
+#: en/live-config.7:124
#, no-wrap
msgid "B<locales>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:95
+#: en/live-config.7:126
msgid "configures locales."
msgstr ""
#. type: IP
-#: en/live-config.7:95
+#: en/live-config.7:126
#, no-wrap
msgid "B<tzdata>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:97
+#: en/live-config.7:128
msgid "configures /etc/timezone."
msgstr ""
#. type: IP
-#: en/live-config.7:97
+#: en/live-config.7:128
#, no-wrap
msgid "B<gdm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:99
+#: en/live-config.7:130
msgid "configures autologin in gdm (lenny)."
msgstr ""
#. type: IP
-#: en/live-config.7:99
+#: en/live-config.7:130
#, no-wrap
msgid "B<gdm3>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:101
+#: en/live-config.7:132
msgid "configures autologin in gdm3 (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:101
+#: en/live-config.7:132
#, no-wrap
msgid "B<kdm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:103
+#: en/live-config.7:134
msgid "configures autologin in kdm."
msgstr ""
#. type: IP
-#: en/live-config.7:103
+#: en/live-config.7:134
#, no-wrap
msgid "B<lxdm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:105
+#: en/live-config.7:136
msgid "configures autologin in lxdm."
msgstr ""
#. type: IP
-#: en/live-config.7:105
+#: en/live-config.7:136
#, no-wrap
msgid "B<nodm>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:107
+#: en/live-config.7:138
msgid "configures autologin in nodm."
msgstr ""
#. type: IP
-#: en/live-config.7:107
+#: en/live-config.7:138
+#, no-wrap
+msgid "B<console-common>, console-setup (lenny), B<keyboard-configuration> (squeeze and newer)"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:140
+msgid "configures the keyboard."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:140
+#, no-wrap
+msgid "B<sysvinit>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:142
+msgid "configures sysvinit."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:142
+#, no-wrap
+msgid "B<login>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:144
+msgid "disables lastlog."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:144
#, no-wrap
msgid "B<apport>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:109
+#: en/live-config.7:146
msgid "enables apport."
msgstr ""
#. type: IP
-#: en/live-config.7:109
+#: en/live-config.7:146
#, no-wrap
msgid "B<gnome-panel-data>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:111
+#: en/live-config.7:148
msgid "disables lock button for the screen."
msgstr ""
#. type: IP
-#: en/live-config.7:111
+#: en/live-config.7:148
#, no-wrap
msgid "B<gnome-power-manager>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:113
+#: en/live-config.7:150
msgid "disables hibernation."
msgstr ""
#. type: IP
-#: en/live-config.7:113
+#: en/live-config.7:150
#, no-wrap
msgid "B<gnome-screensaver>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:115
+#: en/live-config.7:152
msgid "disables the screensaver locking the screen."
msgstr ""
#. type: IP
-#: en/live-config.7:115
+#: en/live-config.7:152
#, no-wrap
msgid "B<initramfs-tools>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:117
+#: en/live-config.7:154
msgid ""
"makes update-initramfs to also update the live media when using persistency."
msgstr ""
#. type: IP
-#: en/live-config.7:117
+#: en/live-config.7:154
#, no-wrap
msgid "B<kaboom>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:119
+#: en/live-config.7:156
msgid "disables kde migration wizard (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:119
+#: en/live-config.7:156
#, no-wrap
msgid "B<kde-services>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:121
+#: en/live-config.7:158
msgid "disables some unwanted KDE services (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:121
+#: en/live-config.7:158
#, no-wrap
msgid "B<kpersonalizer>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:123
+#: en/live-config.7:160
msgid "disables kde configuration wizard (lenny)."
msgstr ""
#. type: IP
-#: en/live-config.7:123
+#: en/live-config.7:160
#, no-wrap
msgid "B<live-installer-launcher>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:125
+#: en/live-config.7:162
msgid "adds live-installer-launcher on users desktop."
msgstr ""
#. type: IP
-#: en/live-config.7:125
+#: en/live-config.7:162
#, no-wrap
msgid "B<module-init-tools>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:127
+#: en/live-config.7:164
msgid "automatically load some modules on some architectures."
msgstr ""
#. type: IP
-#: en/live-config.7:127
+#: en/live-config.7:164
#, no-wrap
msgid "B<policykit>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:129
+#: en/live-config.7:166
msgid "grant user privilegies through policykit."
msgstr ""
#. type: IP
-#: en/live-config.7:129
+#: en/live-config.7:166
#, no-wrap
msgid "B<sslcert>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:131
+#: en/live-config.7:168
msgid "regenerating ssl snake-oil certificates."
msgstr ""
#. type: IP
-#: en/live-config.7:131
+#: en/live-config.7:168
#, no-wrap
msgid "B<update-notifier>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:133
+#: en/live-config.7:170
msgid "disables update-notifier."
msgstr ""
#. type: IP
-#: en/live-config.7:133
+#: en/live-config.7:170
+#, no-wrap
+msgid "B<anacron>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:172
+msgid "disables anacron."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:172
+#, no-wrap
+msgid "B<util-linux>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:174
+msgid "disables util-linux' hwclock."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:174
#, no-wrap
-msgid "B<hook>"
+msgid "B<hooks>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:135
+#: en/live-config.7:176
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:136
+#: en/live-config.7:177
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/live-config.7:137
+#: en/live-config.7:178
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:138
+#: en/live-config.7:179
#, no-wrap
msgid "B</etc/live/config.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-config.7:139
+#: en/live-config.7:180
#, no-wrap
msgid "B<live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:140
+#: en/live-config.7:181
#, no-wrap
msgid "B<live/config.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-config.7:141
+#: en/live-config.7:182
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr ""
#. type: IP
-#: en/live-config.7:142
+#: en/live-config.7:183
#, no-wrap
msgid "B</lib/live/config/>"
msgstr ""
#. type: IP
-#: en/live-config.7:143
+#: en/live-config.7:184
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr ""
#. type: SH
-#: en/live-config.7:145
+#: en/live-config.7:186
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-config.7:147
+#: en/live-config.7:188
msgid "I<live-boot>(7)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:149
+#: en/live-config.7:190
msgid "I<live-helper>(7)"
msgstr ""
#. type: SH
-#: en/live-config.7:150
+#: en/live-config.7:191
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-config.7:152
+#: en/live-config.7:193
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 "
@@ -793,13 +1017,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:153
+#: en/live-config.7:194
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-config.7:155
+#: en/live-config.7:196
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 "
@@ -808,13 +1032,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:156
+#: en/live-config.7:197
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-config.7:157
+#: en/live-config.7:198
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.sh b/scripts/config.sh
index 45d9efc..074bc77 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -81,9 +81,26 @@ Cmdline ()
LIVE_UTC="${_PARAMETER#live-config.utc=}"
;;
- # 999-hook
- live-config.hook=*)
- LIVE_HOOK="${_PARAMETER#live-config.hook=}"
+ # 012-console-setup, 013-keyboard-configuration
+ live-config.keyboard-model=*)
+ LIVE_KEYBOARD_MODEL="${_PARAMETER#live-config.keyboard-model=}"
+ ;;
+
+ live-config.keyboard-layout=*)
+ LIVE_KEYBOARD_LAYOUT="${_PARAMETER#live-config.keyboard-layout=}"
+ ;;
+
+ live-config.keyboard-variant=*)
+ LIVE_KEYBOARD_VARIANT="${_PARAMETER#live-config.keyboard-variant=}"
+ ;;
+
+ live-config.keyboard-options=*)
+ LIVE_KEYBOARD_OPTIONS="${_PARAMETER#live-config.keyboard-options=}"
+ ;;
+
+ # 999-hooks
+ live-config.hooks=*)
+ LIVE_HOOKS="${_PARAMETER#live-config.hooks=}"
;;
# Shortcuts
@@ -93,7 +110,12 @@ Cmdline ()
LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sudo,policykit"
;;
- live-config.noxlogin)
+ live-config.nottyautologin)
+ _SCRIPTS="${_SCRIPTS:-$(ls /lib/live/config/*)}"
+ LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sysvinit"
+ ;;
+
+ live-config.noxautologin)
# Disables graphical autologin, no matter what
# mechanism
_SCRIPTS="${_SCRIPTS:-$(ls /lib/live/config/*)}"
diff --git a/scripts/config/004-locales b/scripts/config/004-locales
index 6f8e703..895b470 100755
--- a/scripts/config/004-locales
+++ b/scripts/config/004-locales
@@ -54,12 +54,11 @@ Configure_locales ()
if echo "${_LOCALE}" | grep -sqE '^[[:lower:]]{2}$'
then
- # input is like "locale=it", so we will convert and setup also the keyboard if not already set
- if [ -z "${KBD}" ]
+ # input is like "locale=ch", so we will convert and setup also the keyboard if not already set
+ if [ -z "${_KEYBOARD}" ]
then
- # FIXME: look if this keyb is supported
- KBD="${_LOCALE}"
- export KBD
+ _KEYBOARD="${_LOCALE}"
+ export _KEYBOARD
fi
_LOCALE_UP=$(echo "${_LOCALE}" | tr '[a-z]' '[A-Z]')
diff --git a/scripts/config/009-lxdm b/scripts/config/011-console-common
similarity index 53%
copy from scripts/config/009-lxdm
copy to scripts/config/011-console-common
index 43926c6..d708db6 100755
--- a/scripts/config/009-lxdm
+++ b/scripts/config/011-console-common
@@ -8,31 +8,29 @@
# under certain conditions; see COPYING for details.
-Lxdm ()
+Console_common ()
{
# Checking if package is installed or already configured
- if [ ! -e /var/lib/dpkg/info/lxdm.list ] || \
- [ -e /var/lib/live/config/lxdm ]
+ if [ ! -e /var/lib/dpkg/info/console-common.list ] || \
+ [ -e /var/lib/live/config/console-common.list ]
then
return
fi
- echo -n " lxdm"
+ echo -n " console-common"
- Configure_lxdm
+ Configure_console_common
}
-Configure_lxdm ()
+Configure_console_common ()
{
- if [ -e /etc/lxdm/lxdm.conf ]
+ if [ -n "${_KEYBOARD}" ]
then
- sed -i -r -e "s|^#?autologin=.*\$|autologin=${LIVE_USERNAME}|" \
- -e "s|^#?session.*\$|session|" \
- /etc/lxdm/lxdm.conf
- fi
+ install-keymap ${_KEYBOARD}
- # Creating state file
- touch /var/lib/live/config/lxdm
+ # Creating state file
+ touch /var/lib/live/config/console-common
+ fi
}
-Lxdm
+Console_common
diff --git a/scripts/config/012-console-setup b/scripts/config/012-console-setup
new file mode 100755
index 0000000..4a94987
--- /dev/null
+++ b/scripts/config/012-console-setup
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+# live-config(7) - System Configuration Scripts
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+#
+# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+
+Console_setup ()
+{
+ # Checking if package is installed or already configured
+ if [ ! -e /var/lib/dpkg/info/console-setup.list ] || \
+ [ -e /var/lib/live/config/console-setup ]
+ then
+ return
+ fi
+
+ # Don't run on squeeze and newer
+ if [ -e /var/lib/dpkg/info/keyboard-configuration.list ]
+ then
+ return
+ fi
+
+ echo -n " console-setup"
+
+ Configure_console_setup
+}
+
+Configure_console_setup ()
+{
+ if [ -n "${LIVE_KEYBOARD_MODEL}" ]
+ then
+ echo "console-setup console-setup/modelcode select ${LIVE_KEYBOARD_MODEL}" >> /tmp/debconf.live
+
+ sed -i -e "s|^XKBMODEL=.*$|XKBMODEL=\"${LIVE_KEYBOARD_MODEL}\"|" /etc/default/console-setup
+ fi
+
+ if [ -n "${LIVE_KEYBOARD_LAYOUT}" ]
+ then
+ echo "console-setup console-setup/layoutcode select ${LIVE_KEYBOARD_LAYOUT}" >> /tmp/debconf.live
+
+ sed -i -e "s|^XKBLAYOUT=.*$|XKBLAYOUT=\"${LIVE_KEYBOARD_LAYOUT}\"|" /etc/default/console-setup
+ fi
+
+ if [ -n "${LIVE_KEYBOARD_VARIANT}" ]
+ then
+ echo "console-setup console-setup/variantcode select ${LIVE_KEYBOARD_VARIANT}" >> /tmp/debconf.live
+
+ sed -i -e "s|^XKBVARIANT=.*$|XKBVARIANT=\"${LIVE_KEYBOARD_VARIANT}\"|" /etc/default/console-setup
+ fi
+
+ if [ -n "${LIVE_KEYBOARD_OPTIONS}" ]
+ then
+ echo "console-setup console-setup/variantcode string ${LIVE_KEYBOARD_OPTIONS}" >> /tmp/debconf.live
+
+ sed -i -e "s|^XKBOPTIONS=.*$|XKBOPTIONS=\"${LIVE_KEYBOARD_OPTIONS}\"|" /etc/default/console-setup
+ fi
+
+ if [ -e /tmp/debconf.live ]
+ then
+ debconf-set-selections < /tmp/debconf.live
+ rm -f /tmp/debconf.live
+
+ # Creating state file
+ touch /var/lib/live/config/console-setup
+ fi
+}
+
+Console_setup
diff --git a/scripts/config/013-keyboard-configuration b/scripts/config/013-keyboard-configuration
new file mode 100755
index 0000000..0637529
--- /dev/null
+++ b/scripts/config/013-keyboard-configuration
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+# live-config(7) - System Configuration Scripts
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+#
+# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+
+Keyboard_configuration ()
+{
+ # Checking if package is installed or already configured
+ if [ ! -e /var/lib/dpkg/info/keyboard-configuration.list ] || \
+ [ -e /var/lib/live/config/keyboard-configuration ]
+ then
+ return
+ fi
+
+ echo -n " keyboard-configuration"
+
+ Configure_keyboard_configuration
+}
+
+Configure_keyboard_configuration ()
+{
+ if [ -n "${LIVE_KEYBOARD_MODEL}" ]
+ then
+ echo "keyboard-configuration keyboard-configuration/modelcode select ${LIVE_KEYBOARD_MODEL}" >> /tmp/debconf.live
+
+ sed -i -e "s|^XKBMODEL=.*$|XKBMODEL=\"${LIVE_KEYBOARD_MODEL}\"|" /etc/default/keyboard
+ fi
+
+ if [ -n "${LIVE_KEYBOARD_LAYOUT}" ]
+ then
+ echo "keyboard-configuration keyboard-configuration/layoutcode select ${LIVE_KEYBOARD_LAYOUT}" >> /tmp/debconf.live
+
+ sed -i -e "s|^XKBLAYOUT=.*$|XKBLAYOUT=\"${LIVE_KEYBOARD_LAYOUT}\"|" /etc/default/keyboard
+ fi
+
+ if [ -n "${LIVE_KEYBOARD_VARIANT}" ]
+ then
+ echo "keyboard-configuration keyboard-configuration/variantcode select ${LIVE_KEYBOARD_VARIANT}" >> /tmp/debconf.live
+
+ sed -i -e "s|^XKBVARIANT=.*$|XKBVARIANT=\"${LIVE_KEYBOARD_VARIANT}\"|" /etc/default/keyboard
+ fi
+
+ if [ -n "${LIVE_KEYBOARD_OPTIONS}" ]
+ then
+ echo "keyboard-configuration keyboard-configuration/variantcode string ${LIVE_KEYBOARD_OPTIONS}" >> /tmp/debconf.live
+
+ sed -i -e "s|^XKBOPTIONS=.*$|XKBOPTIONS=\"${LIVE_KEYBOARD_OPTIONS}\"|" /etc/default/keyboard
+ fi
+
+ if [ -e /tmp/debconf.live ]
+ then
+ debconf-set-selections < /tmp/debconf.live
+ rm -f /tmp/debconf.live
+
+ # Creating state file
+ touch /var/lib/live/config/keyboard-configuration
+ fi
+}
+
+Keyboard_configuration
diff --git a/scripts/config/009-lxdm b/scripts/config/014-sysvinit
similarity index 54%
copy from scripts/config/009-lxdm
copy to scripts/config/014-sysvinit
index 43926c6..98b40d3 100755
--- a/scripts/config/009-lxdm
+++ b/scripts/config/014-sysvinit
@@ -8,31 +8,28 @@
# under certain conditions; see COPYING for details.
-Lxdm ()
+Sysvinit ()
{
# Checking if package is installed or already configured
- if [ ! -e /var/lib/dpkg/info/lxdm.list ] || \
- [ -e /var/lib/live/config/lxdm ]
+ if [ ! -e /var/lib/dpkg/info/sysvinit.list ] || \
+ [ -e /var/lib/live/config/sysvinit ]
then
return
fi
- echo -n " lxdm"
+ echo -n " sysvinit"
- Configure_lxdm
+ Configure_sysvinit
}
-Configure_lxdm ()
+Configure_sysvinit ()
{
- if [ -e /etc/lxdm/lxdm.conf ]
- then
- sed -i -r -e "s|^#?autologin=.*\$|autologin=${LIVE_USERNAME}|" \
- -e "s|^#?session.*\$|session|" \
- /etc/lxdm/lxdm.conf
- fi
+ sed -i -e "s|^\([^:]*:[^:]*:[^:]*\):.*getty.*\<\(tty[0-9]*\).*$|\1:/bin/login -f ${LIVE_USERNAME} </dev/\2 >/dev/\2 2>\&1|" /etc/inittab
+
+ init q
# Creating state file
- touch /var/lib/live/config/lxdm
+ touch /var/lib/live/config/sysvinit
}
-Lxdm
+Sysvinit
diff --git a/scripts/config/113-anacron b/scripts/config/113-anacron
new file mode 100755
index 0000000..5fa92d0
--- /dev/null
+++ b/scripts/config/113-anacron
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# live-config(7) - System Configuration Scripts
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+#
+# live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+
+Anacron ()
+{
+ # Checking if package is installed
+ if [ ! -e /var/lib/dpkg/info/anacron.list ] || \
+ [ -e /var/lib/live/config/anacron ]
+ then
+ return
+ fi
+
+ echo -n " anacron"
+
+ Configure_anacron
+}
+
+Configure_anacron ()
+{
+ # This has the nice side effect of the cron.{daily,weekly,monthly} jobs
+ # in /etc/crontab remaining disabled, yet also not run by anacron
+ dpkg-divert --quiet --package live-config --add --rename --divert /usr/sbin/anacron.debian /usr/sbin/anacron
+
+ ln -s /bin/true /usr/sbin/anacron
+
+ # Creating state file
+ touch /var/lib/live/config/anacron
+}
+
+Anacron
diff --git a/scripts/config/111-sslcert b/scripts/config/114-util-linux
similarity index 60%
copy from scripts/config/111-sslcert
copy to scripts/config/114-util-linux
index 76e2b62..3f5c87a 100755
--- a/scripts/config/111-sslcert
+++ b/scripts/config/114-util-linux
@@ -8,26 +8,26 @@
# under certain conditions; see COPYING for details.
-Sslcert ()
+Util_linux ()
{
# Checking if package is installed
- if [ ! -e /var/lib/dpkg/info/sslcert.list ] || \
- [ -e /var/lib/live/config/sslcert ]
+ if [ ! -e /var/lib/dpkg/info/util-linux.list ] || \
+ [ -e /var/lib/live/config/util-linux ]
then
return
fi
- echo -n " sslcert"
+ echo -n " util-linux"
- Configure_sslcert
+ Configure_util_linux
}
-Configure_sslcert ()
+Configure_util_linux ()
{
- make-ssl-cert generate-default-snakeoil --force-overwrite
+ rm -f /etc/rc?.d/*hwclock*
# Creating state file
- touch /var/lib/live/config/sslcert
+ touch /var/lib/live/config/util-linux
}
-Sslcert
+Util_linux
diff --git a/scripts/config/111-sslcert b/scripts/config/115-login
similarity index 58%
copy from scripts/config/111-sslcert
copy to scripts/config/115-login
index 76e2b62..3957960 100755
--- a/scripts/config/111-sslcert
+++ b/scripts/config/115-login
@@ -8,26 +8,27 @@
# under certain conditions; see COPYING for details.
-Sslcert ()
+Login ()
{
# Checking if package is installed
- if [ ! -e /var/lib/dpkg/info/sslcert.list ] || \
- [ -e /var/lib/live/config/sslcert ]
+ if [ ! -e /var/lib/dpkg/info/login.list ] || \
+ [ -e /var/lib/live/config/login ]
then
return
fi
- echo -n " sslcert"
+ echo -n " login"
- Configure_sslcert
+ Configure_login
}
-Configure_sslcert ()
+Configure_login ()
{
- make-ssl-cert generate-default-snakeoil --force-overwrite
+ # lastlog with autologin doesn't make sense
+ sed -i '/^[^#].*pam_lastlog\.so/s/^/# /' /etc/pam.d/login
# Creating state file
- touch /var/lib/live/config/sslcert
+ touch /var/lib/live/config/login
}
-Sslcert
+Login
diff --git a/scripts/config/999-hook b/scripts/config/999-hooks
similarity index 87%
rename from scripts/config/999-hook
rename to scripts/config/999-hooks
index bd38f92..59fff04 100755
--- a/scripts/config/999-hook
+++ b/scripts/config/999-hooks
@@ -8,21 +8,21 @@
# under certain conditions; see COPYING for details.
-Hook ()
+Hooks ()
{
- if [ -z "${LIVE_HOOK}" ]
+ if [ -z "${LIVE_HOOKS}" ]
then
return
fi
- echo -n " hook"
+ echo -n " hooks"
- Process_hook
+ Process_hooks
}
-Process_hook ()
+Process_hooks ()
{
- for _HOOK in $(echo ${LIVE_HOOK} | sed -e 's/|/ /g')
+ for _HOOK in $(echo ${LIVE_HOOKS} | sed -e 's/|/ /g')
do
_TMPFILE="$(mktemp -t live-config.XXXXXXXX)"
@@ -53,4 +53,4 @@ Process_hook ()
done
}
-Hook
+Hooks
--
live-config
More information about the debian-live-changes
mailing list