[SCM] live-config branch, upstream, updated. upstream/3.0_a37-1-g9ca84f7
Daniel Baumann
daniel at debian.org
Mon Jun 4 10:49:26 UTC 2012
The following commit has been merged in the upstream branch:
commit 9ca84f7945f71c0dcca5bac61575c0ca0165aaf9
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jun 4 12:49:13 2012 +0200
Adding upstream version 3.0~a38.
diff --git a/VERSION b/VERSION
index ca7b780..cf9496d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a37-1
+3.0~a38-1
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 1889661..08dc3ac 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 09.04.2012 3.0~a37\-1 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 04.06.2012 3.0~a38\-1 "Debian Live Projekt"
.SH NAME
\fBlive\-config\fP \- System Konfiguration Skripte
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 24ae0ea..1a36956 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 2012\-04\-09 3.0~a37-1 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2012\-06\-04 3.0~a38-1 "Debian Live Project"
.SH NAME
\fBlive\-config\fR \- System Configuration Scripts
diff --git a/manpages/es/live-config.es.7 b/manpages/es/live-config.es.7
index c789a75..31f2adb 100644
--- a/manpages/es/live-config.es.7
+++ b/manpages/es/live-config.es.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 09.04.2012 3.0~a37\-1 "Proyecto Debian Live"
+.TH LIVE\-CONFIG 7 04.06.2012 3.0~a38\-1 "Proyecto Debian Live"
.SH NOMBRE
\fBlive\-config\fP \- Scripts de configuración del sistema
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index dc31e38..5423734 100644
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -11,18 +11,18 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 09.04.2012 3.0~a37\-1 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 04.06.2012 3.0~a38\-1 "Projet Debian Live"
.SH NOM
\fBlive\-config\fP \- Scripts de configuration du système
.SH DESCRIPTION
-\fBlive\-config\fP contient les scripts chargés de configurer le système Live
-Debian lors du processus de démarrage (late userspace).
+\fBlive\-config\fP contient les scripts chargés de configurer le système Debian
+Live lors du processus de démarrage (late userspace).
.SH CONFIGURATION
-\fBlive\-config\fP peut être configuré en utilisant les paramètres d'amorçage ou
-les fichiers de configuration. Si ces deux mécanismes sont utilisés pour
+\fBlive\-config\fP peut être configuré en utilisant des paramètres d'amorçage ou
+des fichiers de configuration. Si ces deux mécanismes sont utilisés pour
certaines options, les paramètres d'amorçage sont prioritaires sur les
fichiers de configuration. Lorsque l'on utilise la persistance, les scripts
\fBlive\-config\fP ne sont lancés qu'une seule fois.
@@ -158,7 +158,7 @@ facilement plusieurs options.
.IP "\fBlive\-config.noroot\fP | \fBnoroot\fP" 4
Désactive sudo et policykit, dans ce cas l'utilisateur ne peut pas obtenir
-les privilèges du administrateur (root) sur le système.
+des privilèges d'administrateur (root) sur le système.
.IP "\fBlive\-config.nottyautologin\fP | \fBnoautologin\fP" 4
Désactive l'auto\-login sur la console et l'auto\-login graphique.
.IP "\fBlive\-config.nottyautologin\fP | \fBnottyautologin\fP" 4
diff --git a/manpages/it/live-config.it.7 b/manpages/it/live-config.it.7
index 55045ab..c2396bf 100644
--- a/manpages/it/live-config.it.7
+++ b/manpages/it/live-config.it.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 09\-04\-2012 3.0~a37\-1 "Progetto Debian Live"
+.TH LIVE\-CONFIG 7 04\-06\-2012 3.0~a38\-1 "Progetto Debian Live"
.SH NOME
\fBlive\-config\fP \- Script di configurazione del sistema
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index 6f7831b..239da8b 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 3.0~a36-1\n"
-"POT-Creation-Date: 2012-04-09 19:02+0300\n"
+"Project-Id-Version: live-config 3.0~a38-1\n"
+"POT-Creation-Date: 2012-06-04 12:43+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-04-09"
-msgstr "09.04.2012"
+msgid "2012-06-04"
+msgstr "04.06.2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a37-1"
-msgstr "3.0~a37-1"
+msgid "3.0~a38-1"
+msgstr "3.0~a38-1"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/po/es/live-config.7.po b/manpages/po/es/live-config.7.po
index 3522715..a4e83f7 100644
--- a/manpages/po/es/live-config.7.po
+++ b/manpages/po/es/live-config.7.po
@@ -5,8 +5,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a36-1\n"
-"POT-Creation-Date: 2012-04-09 19:02+0300\n"
+"Project-Id-Version: live-config 3.0~a38-1\n"
+"POT-Creation-Date: 2012-06-04 12:43+0300\n"
"PO-Revision-Date: 2012-04-07 17:19+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -25,14 +25,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-04-09"
-msgstr "09.04.2012"
+msgid "2012-06-04"
+msgstr "04.06.2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a37-1"
-msgstr "3.0~a37-1"
+msgid "3.0~a38-1"
+msgstr "3.0~a38-1"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index 8612f90..58045a5 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -2,14 +2,15 @@
# 2010 Thierry Lépicier <thierry.lepicier at free.fr>
# 2011-2012 Carlos Zuferri "chals" <chals at altorricon.com>
# This file is distributed under the same license as the live-config package.
+# Carlos Zuferri «chals» <chals at altorricon.com>, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a36-1\n"
-"POT-Creation-Date: 2012-04-09 19:02+0300\n"
-"PO-Revision-Date: 2012-04-07 16:54+0200\n"
+"Project-Id-Version: live-config 3.0~a38-1\n"
+"POT-Creation-Date: 2012-06-04 12:43+0300\n"
+"PO-Revision-Date: 2012-04-18 15:46+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
-"Language-Team: none\n"
+"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,14 +26,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-04-09"
-msgstr "09.04.2012"
+msgid "2012-06-04"
+msgstr "04.06.2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a37-1"
-msgstr "3.0~a37-1"
+msgid "3.0~a38-1"
+msgstr "3.0~a38-1"
#. type: TH
#: en/live-config.7:9
@@ -63,8 +64,8 @@ msgid ""
"B<live-config> contains the scripts that configure a Debian Live system "
"during the boot process (late userspace)."
msgstr ""
-"B<live-config> contient les scripts chargés de configurer le système Live "
-"Debian lors du processus de démarrage (late userspace)."
+"B<live-config> contient les scripts chargés de configurer le système Debian "
+"Live lors du processus de démarrage (late userspace)."
#. type: SH
#: en/live-config.7:17
@@ -80,8 +81,8 @@ msgid ""
"take precedence over the configuration files. When using persistency, B<live-"
"config> scripts are only run once."
msgstr ""
-"B<live-config> peut être configuré en utilisant les paramètres d'amorçage ou "
-"les fichiers de configuration. Si ces deux mécanismes sont utilisés pour "
+"B<live-config> peut être configuré en utilisant des paramètres d'amorçage ou "
+"des fichiers de configuration. Si ces deux mécanismes sont utilisés pour "
"certaines options, les paramètres d'amorçage sont prioritaires sur les "
"fichiers de configuration. Lorsque l'on utilise la persistance, les scripts "
"B<live-config> ne sont lancés qu'une seule fois."
@@ -548,7 +549,7 @@ msgid ""
"system."
msgstr ""
"Désactive sudo et policykit, dans ce cas l'utilisateur ne peut pas obtenir "
-"les privilèges du administrateur (root) sur le système."
+"des privilèges d'administrateur (root) sur le système."
#. type: IP
#: en/live-config.7:93
diff --git a/manpages/po/it/live-config.7.po b/manpages/po/it/live-config.7.po
index c5144e3..e2cc015 100644
--- a/manpages/po/it/live-config.7.po
+++ b/manpages/po/it/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a36-1\n"
-"POT-Creation-Date: 2012-04-09 19:02+0300\n"
+"Project-Id-Version: live-config 3.0~a38-1\n"
+"POT-Creation-Date: 2012-06-04 12:43+0300\n"
"PO-Revision-Date: 2011-12-06 08:01+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-04-09"
-msgstr "09-04-2012"
+msgid "2012-06-04"
+msgstr "04-06-2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a37-1"
-msgstr "3.0~a37-1"
+msgid "3.0~a38-1"
+msgstr "3.0~a38-1"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/po/pt_BR/live-config.7.po b/manpages/po/pt_BR/live-config.7.po
index 4e63250..d547b67 100644
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a36-1\n"
-"POT-Creation-Date: 2012-04-09 19:02+0300\n"
+"Project-Id-Version: live-config 3.0~a38-1\n"
+"POT-Creation-Date: 2012-06-04 12:43+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Tassia Camoes Araujo <tassia at gmail.com>\n"
"Language-Team: none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-04-09"
-msgstr "09-04-2012"
+msgid "2012-06-04"
+msgstr "04-06-2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a37-1"
-msgstr "3.0~a37-1"
+msgid "3.0~a38-1"
+msgstr "3.0~a38-1"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 3631277..a9abd28 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: 2012-04-09 19:02+0300\n"
+"POT-Creation-Date: 2012-06-04 12:43+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-04-09"
+msgid "2012-06-04"
msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a37-1"
+msgid "3.0~a38-1"
msgstr ""
#. type: TH
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index 272e0b9..d40f8a2 100644
--- a/manpages/pt_BR/live-config.pt_BR.7
+++ b/manpages/pt_BR/live-config.pt_BR.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 09\-04\-2012 3.0~a37\-1 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 04\-06\-2012 3.0~a38\-1 "Projeto Debian Live"
.SH NOME
\fBlive\-config\fP \- Scripts para Configuração do Sistema
diff --git a/scripts/config.sh b/scripts/config.sh
index 7eedcf9..270973b 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -167,33 +167,15 @@ Main ()
echo -n "live-config:"
trap 'Trap' EXIT HUP INT QUIT TERM
- # Reading configuration file from filesystem
- if [ -e /etc/live/config.conf ]
- then
- . /etc/live/config.conf
- fi
-
- if ls /etc/live/config.d/*.conf > /dev/null 2>&1
- then
- for _FILE in /etc/live/config.d/*.conf
- do
- . ${_FILE}
- done
- fi
-
- # Reading configuration file from live-media
- if [ -e /live/image/live/config.conf ]
- then
- . /live/image/live/config.conf
- fi
-
- if ls /live/image/live/config.d/*.conf > /dev/null 2>&1
- then
- for _FILE in /live/image/live/config.d/*.conf
- do
- . ${_FILE}
- done
- fi
+ # Reading configuration file from filesystem and live-media
+ for _FILE in /etc/live/config.conf /etc/live/config.d/*.conf \
+ /live/image/live/config.conf /live/image/live/config.d/*.conf
+ do
+ if [ -e "${_FILE}" ]
+ then
+ . "${_FILE}"
+ fi
+ done
# Reading kernel command line
Cmdline
diff --git a/scripts/config/019-upstart b/scripts/config/019-upstart
index 62dd548..919f580 100755
--- a/scripts/config/019-upstart
+++ b/scripts/config/019-upstart
@@ -34,7 +34,7 @@ Upstart ()
Configure_upstart ()
{
- for _FILE in /etc/init/tty*
+ for _FILE in /etc/init/tty[0-9]*.conf
do
_TTY="$(basename ${_FILE} .conf)"
@@ -50,7 +50,7 @@ Configure_upstart ()
init q
- for _FILE in /etc/init/tty*
+ for _FILE in /etc/init/tty[0-9]*.conf
do
_TTY="$(basename ${_FILE} .conf)"
diff --git a/scripts/config/118-openssh-server b/scripts/config/118-openssh-server
index 0e44525..f6d253a 100755
--- a/scripts/config/118-openssh-server
+++ b/scripts/config/118-openssh-server
@@ -24,27 +24,16 @@ Openssh_server ()
Configure_openssh_server ()
{
- if [ ! -e /etc/ssh/ssh_host_rsa_key ]
- then
- ssh-keygen -q -f /etc/ssh/ssh_host_rsa_key -N "" -t rsa
-
- _SSH="true"
- fi
-
- if [ ! -e /etc/ssh/ssh_host_dsa_key ]
- then
- ssh-keygen -q -f /etc/ssh/ssh_host_dsa_key -N "" -t dsa
-
- _SSH="true"
- fi
-
- if [ -e /run ] && [ ! -e /etc/ssh/ssh_host_ecdsa_key ]
- then
- # FIXME: use some better >= wheezy detection than existence of /run
- ssh-keygen -q -f /etc/ssh/ssh_host_ecdsa_key -N "" -t ecdsa
-
- _SSH="true"
- fi
+ for _PROTOCOL in dsa rsa ecdsa
+ do
+ if [ ! -e /etc/ssh/ssh_host_${_PROTOCOL}_key ] &&
+ grep -qs ssh_host_${_PROTOCOL}_key /etc/ssh/sshd_config
+ then
+ ssh-keygen -q -f /etc/ssh/ssh_host_${_PROTOCOL}_key -N "" -t ${_PROTOCOL}
+
+ _SSH="true"
+ fi
+ done
if [ "${_SSH}" = "true" ]
then
--
live-config
More information about the debian-live-changes
mailing list