[SCM] live-config branch, upstream, updated. upstream/3.0_a33-1-gc2bfcfe
Daniel Baumann
daniel at debian.org
Tue Apr 3 06:55:24 UTC 2012
The following commit has been merged in the upstream branch:
commit c2bfcfe0e4b52ca50d5c4270df80062ea09fbf18
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Apr 3 08:53:05 2012 +0200
Adding upstream version 3.0~a34.
diff --git a/VERSION b/VERSION
index e847583..871361b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a33-1
+3.0~a34-1
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 92af4f0..b49cff3 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 18.03.2012 3.0~a33\-1 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 03.04.2012 3.0~a34\-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 c37bbd8..91cb7be 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\-03\-18 3.0~a33-1 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2012\-04\-03 3.0~a34-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 8e1045d..a63dedb 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 18.03.2011 3.0~a33\-1 "Proyecto Debian Live"
+.TH LIVE\-CONFIG 7 03.04.2012 3.0~a34\-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 0bf6f41..16e3947 100644
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 18.03.2012 3.0~a33\-1 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 03.04.2012 3.0~a34\-1 "Projet Debian Live"
.SH NOM
\fBlive\-config\fP \- Scripts de configuration du système
diff --git a/manpages/it/live-config.it.7 b/manpages/it/live-config.it.7
index f717bc9..4d9ee11 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 18\-03\-2012 3.0~a33\-1 "Progetto Debian Live"
+.TH LIVE\-CONFIG 7 03\-04\-2012 3.0~a34\-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 6b9b7f6..a4072c7 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~a30\n"
-"POT-Creation-Date: 2012-03-18 14:26+0100\n"
+"Project-Id-Version: live-config 3.0~a34-1\n"
+"POT-Creation-Date: 2012-04-03 08:47+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-03-18"
-msgstr "18.03.2012"
+msgid "2012-04-03"
+msgstr "03.04.2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a33-1"
-msgstr "3.0~a33-1"
+msgid "3.0~a34-1"
+msgstr "3.0~a34-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 b772c88..409c6fe 100644
--- a/manpages/po/es/live-config.7.po
+++ b/manpages/po/es/live-config.7.po
@@ -6,8 +6,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a30\n"
-"POT-Creation-Date: 2012-03-18 14:26+0100\n"
+"Project-Id-Version: live-config 3.0~a34-1\n"
+"POT-Creation-Date: 2012-04-03 08:47+0300\n"
"PO-Revision-Date: 2011-12-06 17:47+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -26,14 +26,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-03-18"
-msgstr "18.03.2011"
+msgid "2012-04-03"
+msgstr "03.04.2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a33-1"
-msgstr "3.0~a33-1"
+msgid "3.0~a34-1"
+msgstr "3.0~a34-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 36c7c2c..9ef5306 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -5,8 +5,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a30\n"
-"POT-Creation-Date: 2012-03-18 14:26+0100\n"
+"Project-Id-Version: live-config 3.0~a34-1\n"
+"POT-Creation-Date: 2012-04-03 08:47+0300\n"
"PO-Revision-Date: 2011-12-06 18:02+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -25,14 +25,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-03-18"
-msgstr "18.03.2012"
+msgid "2012-04-03"
+msgstr "03.04.2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a33-1"
-msgstr "3.0~a33-1"
+msgid "3.0~a34-1"
+msgstr "3.0~a34-1"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/po/it/live-config.7.po b/manpages/po/it/live-config.7.po
index 4c99031..54e87b5 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~a30\n"
-"POT-Creation-Date: 2012-03-18 14:26+0100\n"
+"Project-Id-Version: live-config 3.0~a34-1\n"
+"POT-Creation-Date: 2012-04-03 08:47+0300\n"
"PO-Revision-Date: 2011-12-06 08:01+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-03-18"
-msgstr "18-03-2012"
+msgid "2012-04-03"
+msgstr "03-04-2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a33-1"
-msgstr "3.0~a33-1"
+msgid "3.0~a34-1"
+msgstr "3.0~a34-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 560deca..6012e5e 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~a30\n"
-"POT-Creation-Date: 2012-03-18 14:26+0100\n"
+"Project-Id-Version: live-config 3.0~a34-1\n"
+"POT-Creation-Date: 2012-04-03 08:47+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-03-18"
-msgstr "18-03-2012"
+msgid "2012-04-03"
+msgstr "03-04-2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a33-1"
-msgstr "3.0~a33-1"
+msgid "3.0~a34-1"
+msgstr "3.0~a34-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 3c59cde..cdfee69 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-03-18 14:26+0100\n"
+"POT-Creation-Date: 2012-04-03 08:47+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-03-18"
+msgid "2012-04-03"
msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a33-1"
+msgid "3.0~a34-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 9680ece..3a16577 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 18\-03\-2012 3.0~a33\-1 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 03\-04\-2012 3.0~a34\-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 e43d781..0e9a8e9 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -152,6 +152,11 @@ Start_network ()
Main ()
{
+ if [ ! -e /proc/version ]
+ then
+ mount -n -t proc -onodev,noexec,nosuid -odefaults proc /proc
+ fi
+
_CMDLINE="$(cat /proc/cmdline)"
if ! echo ${_CMDLINE} | grep -qs "boot=live"
--
live-config
More information about the debian-live-changes
mailing list