[SCM] live-debconfig branch, upstream, updated. upstream/4.0_a1-1-g97d9da7
Daniel Baumann
daniel at debian.org
Fri Aug 10 21:11:01 UTC 2012
The following commit has been merged in the upstream branch:
commit 97d9da793d359cd77b3deb353ca9a29c9f6a208f
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Aug 10 23:10:52 2012 +0200
Adding upstream version 4.0~a2.
diff --git a/VERSION b/VERSION
index c3b296a..74e367d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0~a1-1
+4.0~a2-1
diff --git a/manpages/de/live-debconfig.de.7 b/manpages/de/live-debconfig.de.7
index 0b6df3d..a1f670e 100644
--- a/manpages/de/live-debconfig.de.7
+++ b/manpages/de/live-debconfig.de.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-DEBCONFIG 7 02.08.2012 4.0~a1\-1 "Debian Live Projekt"
+.TH LIVE\-DEBCONFIG 7 10.08.2012 4.0~a2\-1 "Debian Live Projekt"
.SH NAME
\fBlive\-debconfig\fP \- System Konfiguration Skripte
diff --git a/manpages/de/live-debconfig_hostname.de.5 b/manpages/de/live-debconfig_hostname.de.5
index 1c1d7eb..2683d75 100644
--- a/manpages/de/live-debconfig_hostname.de.5
+++ b/manpages/de/live-debconfig_hostname.de.5
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-DEBCONFIG 5 02.08.2012 4.0~a1\-1 "Debian Live Projekt"
+.TH LIVE\-DEBCONFIG 5 10.08.2012 4.0~a2\-1 "Debian Live Projekt"
.SH NAME
\fBlive\-debconfig\fP \- Hostname Skript
diff --git a/manpages/en/live-debconfig.7 b/manpages/en/live-debconfig.7
index dee7426..8de78d0 100644
--- a/manpages/en/live-debconfig.7
+++ b/manpages/en/live-debconfig.7
@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
-.TH LIVE\-DEBCONFIG 7 2012\-08\-02 4.0~a1-1 "Debian Live Project"
+.TH LIVE\-DEBCONFIG 7 2012\-08\-10 4.0~a2-1 "Debian Live Project"
.SH NAME
\fBlive\-debconfig\fR \- System Configuration Scripts
diff --git a/manpages/en/live-debconfig_hostname.5 b/manpages/en/live-debconfig_hostname.5
index 0fa5bfe..7471f20 100644
--- a/manpages/en/live-debconfig_hostname.5
+++ b/manpages/en/live-debconfig_hostname.5
@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
-.TH LIVE\-DEBCONFIG 5 2012\-08\-02 4.0~a1-1 "Debian Live Project"
+.TH LIVE\-DEBCONFIG 5 2012\-08\-10 4.0~a2-1 "Debian Live Project"
.SH NAME
\fBlive\-debconfig\fR \- hostname script
diff --git a/manpages/es/live-debconfig.es.7 b/manpages/es/live-debconfig.es.7
index 41e6d41..92beb4c 100644
--- a/manpages/es/live-debconfig.es.7
+++ b/manpages/es/live-debconfig.es.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-DEBCONFIG 7 2012\-07\-30 4.0~a1\-1 "Proyecto Debian Live"
+.TH LIVE\-DEBCONFIG 7 2012\-07\-30 4.0~a2\-1 "Proyecto Debian Live"
.SH NOMBRE
\fBlive\-debconfig\fP \- Scripts de Configuración del Sistema
diff --git a/manpages/es/live-debconfig_hostname.es.5 b/manpages/es/live-debconfig_hostname.es.5
index a9ad7ba..0a1999a 100644
--- a/manpages/es/live-debconfig_hostname.es.5
+++ b/manpages/es/live-debconfig_hostname.es.5
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-DEBCONFIG 5 2012\-07\-30 4.0~a1\-1 "Proyecto Debian Live"
+.TH LIVE\-DEBCONFIG 5 2012\-07\-30 4.0~a2\-1 "Proyecto Debian Live"
.SH NOMBRE
\fBlive\-debconfig\fP \- script hostname
diff --git a/manpages/po/de/live-debconfig.7.po b/manpages/po/de/live-debconfig.7.po
index 255b6c3..3b4fed3 100644
--- a/manpages/po/de/live-debconfig.7.po
+++ b/manpages/po/de/live-debconfig.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-debconfig 4.0~a1-1\n"
-"POT-Creation-Date: 2012-08-02 22:19+0300\n"
+"Project-Id-Version: live-debconfig 4.0~a2-1\n"
+"POT-Creation-Date: 2012-08-10 23:08+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-DEBCONFIG"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "2012-08-02"
-msgstr "02.08.2012"
+msgid "2012-08-10"
+msgstr "10.08.2012"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "4.0~a1-1"
-msgstr "4.0~a1-1"
+msgid "4.0~a2-1"
+msgstr "4.0~a2-1"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
diff --git a/manpages/po/de/live-debconfig_hostname.5.po b/manpages/po/de/live-debconfig_hostname.5.po
index 35ba625..3445e27 100644
--- a/manpages/po/de/live-debconfig_hostname.5.po
+++ b/manpages/po/de/live-debconfig_hostname.5.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-debconfig 4.0~a1-1\n"
-"POT-Creation-Date: 2012-08-02 22:19+0300\n"
+"Project-Id-Version: live-debconfig 4.0~a2-1\n"
+"POT-Creation-Date: 2012-08-10 23:08+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-DEBCONFIG"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "2012-08-02"
-msgstr "02.08.2012"
+msgid "2012-08-10"
+msgstr "10.08.2012"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "4.0~a1-1"
-msgstr "4.0~a1-1"
+msgid "4.0~a2-1"
+msgstr "4.0~a2-1"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
diff --git a/manpages/po/es/live-debconfig.7.po b/manpages/po/es/live-debconfig.7.po
index 05ec55e..8ef4c80 100644
--- a/manpages/po/es/live-debconfig.7.po
+++ b/manpages/po/es/live-debconfig.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-debconfig 4.0~a1-1\n"
-"POT-Creation-Date: 2012-08-02 22:19+0300\n"
+"Project-Id-Version: live-debconfig 4.0~a2-1\n"
+"POT-Creation-Date: 2012-08-10 23:08+0300\n"
"PO-Revision-Date: 2012-07-30 14:08+0200\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-DEBCONFIG"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "2012-08-02"
+msgid "2012-08-10"
msgstr "2012-07-30"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "4.0~a1-1"
-msgstr "4.0~a1-1"
+msgid "4.0~a2-1"
+msgstr "4.0~a2-1"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
diff --git a/manpages/po/es/live-debconfig_hostname.5.po b/manpages/po/es/live-debconfig_hostname.5.po
index b9f18d7..158a3ad 100644
--- a/manpages/po/es/live-debconfig_hostname.5.po
+++ b/manpages/po/es/live-debconfig_hostname.5.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-debconfig 4.0~a1-1\n"
-"POT-Creation-Date: 2012-08-02 22:19+0300\n"
+"Project-Id-Version: live-debconfig 4.0~a2-1\n"
+"POT-Creation-Date: 2012-08-10 23:08+0300\n"
"PO-Revision-Date: 2012-07-30 14:39+0200\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-DEBCONFIG"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "2012-08-02"
+msgid "2012-08-10"
msgstr "2012-07-30"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "4.0~a1-1"
-msgstr "4.0~a1-1"
+msgid "4.0~a2-1"
+msgstr "4.0~a2-1"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
diff --git a/manpages/pot/live-debconfig.7.pot b/manpages/pot/live-debconfig.7.pot
index 85f5741..a9038d0 100644
--- a/manpages/pot/live-debconfig.7.pot
+++ b/manpages/pot/live-debconfig.7.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-debconfig VERSION\n"
-"POT-Creation-Date: 2012-08-02 22:19+0300\n"
+"POT-Creation-Date: 2012-08-10 23:08+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-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "2012-08-02"
+msgid "2012-08-10"
msgstr ""
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "4.0~a1-1"
+msgid "4.0~a2-1"
msgstr ""
#. type: TH
diff --git a/manpages/pot/live-debconfig_hostname.5.pot b/manpages/pot/live-debconfig_hostname.5.pot
index 4f7d76f..35fa003 100644
--- a/manpages/pot/live-debconfig_hostname.5.pot
+++ b/manpages/pot/live-debconfig_hostname.5.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-debconfig VERSION\n"
-"POT-Creation-Date: 2012-08-02 22:19+0300\n"
+"POT-Creation-Date: 2012-08-10 23:08+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-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "2012-08-02"
+msgid "2012-08-10"
msgstr ""
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "4.0~a1-1"
+msgid "4.0~a2-1"
msgstr ""
#. type: TH
diff --git a/scripts/debconfig/0030-sysvinit b/scripts/debconfig/0030-sysvinit
index 47a5e21..7cb0304 100755
--- a/scripts/debconfig/0030-sysvinit
+++ b/scripts/debconfig/0030-sysvinit
@@ -16,7 +16,7 @@ Defaults ()
{
_LXC_ENABLE="${_LXC_ENABLE:-false}"
_LXC_CONSOLES="${_LXC_CONSOLES:-6}"
- _LXC_DISABLE_SERVICES="${_LXC_DISABLE_SERVICES:-checkroot.sh hwclockfirst.sh hwclock.sh module-init-tools umountfs umountroot}"
+ _LXC_DISABLE_SERVICES="${_LXC_DISABLE_SERVICES:-checkroot.sh hwclockfirst.sh hwclock.sh kmod module-init-tools mountall.sh mountkernfs.sh umountfs umountroot}"
}
db_get live-debconfig/sysvinit/lxc-enable
@@ -140,9 +140,20 @@ case "${_LXC_ENABLE}" in
# Remove pointless services in a container
for _SERVICE in ${_LXC_DISABLE_SERVICES}
do
+ case ${_SERVICE} in
+ umountfs|umountroot)
+ # FIXME: not upgrade safe
+ _ACTION=remove
+ ;;
+
+ *)
+ _ACTION=disable
+ ;;
+ esac
+
if [ -e "/etc/init.d/${_SERVICE}" ]
then
- update-rc.d -f ${_SERVICE} disable 2>&1 | \
+ update-rc.d -f ${_SERVICE} ${_ACTION} 2>&1 | \
grep -v "update-rc.d: using dependency based boot sequencing" | \
grep -v "update-rc.d: error: cannot find a LSB script for mountroot" || true
fi
diff --git a/scripts/debconfig/0030-sysvinit.templates b/scripts/debconfig/0030-sysvinit.templates
index 58fe618..cf68195 100644
--- a/scripts/debconfig/0030-sysvinit.templates
+++ b/scripts/debconfig/0030-sysvinit.templates
@@ -20,9 +20,9 @@ Description: live-debconfig: How many consoles for LXC?
Template: live-debconfig/sysvinit/lxc-disable-services
Type: string
-Default: checkroot.sh hwclockfirst.sh hwclock.sh module-init-tools umountfsumountroot
+Default: checkroot.sh hwclockfirst.sh hwclock.sh kmod module-init-tools mountall.sh mountkernfs.sh umountfs umountroot
Description: live-debconfig: Which services to disable for LXC?
Some services are not useful in containers and should be disabled.
.
- This defaults to checkroot.sh hwclockfirst.sh hwclock.sh module-init-tools
+ This defaults to checkroot.sh hwclockfirst.sh hwclock.sh kmod module-init-tools mountkernfs.sh mountall.sh
umountfs umountroot.
--
live-debconfig
More information about the debian-live-changes
mailing list