[SCM] live-debconfig branch, debian-next, updated. debian/4.0_a2-1-3-gf71f92c
Daniel Baumann
daniel at debian.org
Thu Aug 16 12:16:11 UTC 2012
The following commit has been merged in the debian-next branch:
commit f71f92c7d2b39a47ba6bc0ac2a9c1eb9bf7dacb9
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Aug 16 14:16:01 2012 +0200
Adding util-linux script for setting hwclock options.
diff --git a/manpages/de/live-debconfig.de.7 b/manpages/de/live-debconfig.de.7
index a1f670e..ae29a1b 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 10.08.2012 4.0~a2\-1 "Debian Live Projekt"
+.TH LIVE\-DEBCONFIG 7 16.08.2012 4.0~a2\-1 "Debian Live Projekt"
.SH NAME
\fBlive\-debconfig\fP \- System Konfiguration Skripte
@@ -32,6 +32,9 @@ konfiguriert die Netzwerkeinstellungen des Systems (/etc/network/interfaces,
.IP \fBsysvinit\fP 4
konfiguriert den Typ des Systems für Linux Container, LXC (/etc/inittab),
siehe \fIlive\-debconfig_sysvinit\fP(5).
+.IP \fButil\-linux\fP 4
+konfiguriert den Zugriff auf die Hardware Uhr, siehe
+\fIlive\-debconfig_util\-linux\fP(5).
.IP \fBselinux\fP 4
schaltet SELinux ein oder aus (/selinux), siehe
\fIlive\-debconfig_selinux\fP(5).
diff --git a/manpages/de/live-debconfig_hostname.de.5 b/manpages/de/live-debconfig_hostname.de.5
index 2683d75..00c3a42 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 10.08.2012 4.0~a2\-1 "Debian Live Projekt"
+.TH LIVE\-DEBCONFIG 5 16.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 8de78d0..5d6424d 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\-10 4.0~a2-1 "Debian Live Project"
+.TH LIVE\-DEBCONFIG 7 2012\-08\-16 4.0~a2-1 "Debian Live Project"
.SH NAME
\fBlive\-debconfig\fR \- System Configuration Scripts
@@ -23,6 +23,8 @@ sets the systems hostname (/etc/hostname), see \fIlive\-debconfig_hostname\fR(5)
configures the systems network settings (/etc/network/interfaces, /etc/resolv.conf, /etc/hosts), see \fIlive\-debconfig_ifupdown\fR(5).
.IP "\fBsysvinit\fR" 4
configures the systems type for Linux Containers, LXC (/etc/inittab), see \fIlive\-debconfig_sysvinit\fR(5).
+.IP "\fButil\-linux\fR" 4
+configure the access to the hardware clock, see \fIlive\-debconfig_util\-linux\fR(5).
.IP "\fBselinux\fR" 4
enables or disables selinux (/selinux), see \fIlive\-debconfig_selinux\fR(5).
.IP "\fBopenssh\-server\fR" 4
diff --git a/manpages/en/live-debconfig_hostname.5 b/manpages/en/live-debconfig_hostname.5
index 7471f20..c6cb58b 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\-10 4.0~a2-1 "Debian Live Project"
+.TH LIVE\-DEBCONFIG 5 2012\-08\-16 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 92beb4c..cad624b 100644
--- a/manpages/es/live-debconfig.es.7
+++ b/manpages/es/live-debconfig.es.7
@@ -33,6 +33,9 @@ establece la configuración de red del sistema (/etc/network/interfaces,
.IP \fBsysvinit\fP 4
configura el tipo de sistema para los Linux Containers, LXC (/etc/inittab),
ver \fIlive\-debconfig_sysvinit\fP(5).
+.IP \fButil\-linux\fP 4
+configure the access to the hardware clock, see
+\fIlive\-debconfig_util\-linux\fP(5).
.IP \fBselinux\fP 4
activa o desactiva selinux (/selinux), ver \fIlive\-debconfig_selinux\fP(5).
.IP \fBopenssh\-server\fP 4
diff --git a/manpages/po/de/live-debconfig.7.po b/manpages/po/de/live-debconfig.7.po
index 3b4fed3..f184a6f 100644
--- a/manpages/po/de/live-debconfig.7.po
+++ b/manpages/po/de/live-debconfig.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-debconfig 4.0~a2-1\n"
-"POT-Creation-Date: 2012-08-10 23:08+0300\n"
+"POT-Creation-Date: 2012-08-16 14:13+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,8 +24,8 @@ msgstr "LIVE-DEBCONFIG"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "2012-08-10"
-msgstr "10.08.2012"
+msgid "2012-08-16"
+msgstr "16.08.2012"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
@@ -127,24 +127,39 @@ msgstr ""
#. type: IP
#: en/live-debconfig.7:26
#, no-wrap
+msgid "B<util-linux>"
+msgstr "B<util-linux>"
+
+#. type: Plain text
+#: en/live-debconfig.7:28
+msgid ""
+"configure the access to the hardware clock, see I<live-debconfig_util-linux>"
+"(5)."
+msgstr ""
+"konfiguriert den Zugriff auf die Hardware Uhr, siehe I<live-debconfig_util-"
+"linux>(5)."
+
+#. type: IP
+#: en/live-debconfig.7:28
+#, no-wrap
msgid "B<selinux>"
msgstr "B<selinux>"
#. type: Plain text
-#: en/live-debconfig.7:28
+#: en/live-debconfig.7:30
msgid ""
"enables or disables selinux (/selinux), see I<live-debconfig_selinux>(5)."
msgstr ""
"schaltet SELinux ein oder aus (/selinux), siehe I<live-debconfig_selinux>(5)."
#. type: IP
-#: en/live-debconfig.7:28
+#: en/live-debconfig.7:30
#, no-wrap
msgid "B<openssh-server>"
msgstr "B<openssh-server>"
#. type: Plain text
-#: en/live-debconfig.7:30
+#: en/live-debconfig.7:32
msgid ""
"recreates openssh-server host keys (/etc/ssh/ssh_host_key*), see I<live-"
"debconfig_openssh-server>(5)."
@@ -153,39 +168,39 @@ msgstr ""
"debconfig_openssh-server>(5)."
#. type: SH
-#: en/live-debconfig.7:31 en/live-debconfig_hostname.5:54
+#: en/live-debconfig.7:33 en/live-debconfig_hostname.5:54
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-debconfig.7:33 en/live-debconfig_hostname.5:56
+#: en/live-debconfig.7:35 en/live-debconfig_hostname.5:56
msgid "I<live-boot>(7)"
msgstr "I<live-boot>(7)"
#. type: Plain text
-#: en/live-debconfig.7:35 en/live-debconfig_hostname.5:58
+#: en/live-debconfig.7:37 en/live-debconfig_hostname.5:58
msgid "I<live-build>(7)"
msgstr "I<live-build>(7)"
#. type: Plain text
-#: en/live-debconfig.7:37 en/live-debconfig_hostname.5:60
+#: en/live-debconfig.7:39 en/live-debconfig_hostname.5:60
msgid "I<live-config>(7)"
msgstr "I<live-config>(7)"
#. type: Plain text
-#: en/live-debconfig.7:39 en/live-debconfig_hostname.5:64
+#: en/live-debconfig.7:41 en/live-debconfig_hostname.5:64
msgid "I<live-tools>(7)"
msgstr "I<live-tools>(7)"
#. type: SH
-#: en/live-debconfig.7:40 en/live-debconfig_hostname.5:65
+#: en/live-debconfig.7:42 en/live-debconfig_hostname.5:65
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-debconfig.7:42 en/live-debconfig_hostname.5:67
+#: en/live-debconfig.7:44 en/live-debconfig_hostname.5:67
msgid ""
"More information about live-debconfig and the Debian Live project can be "
"found on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the "
@@ -196,13 +211,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-debconfig.7:43 en/live-debconfig_hostname.5:68
+#: en/live-debconfig.7:45 en/live-debconfig_hostname.5:68
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-debconfig.7:45 en/live-debconfig_hostname.5:70
+#: en/live-debconfig.7:47 en/live-debconfig_hostname.5:70
msgid ""
"Bugs can be reported by submitting a bugreport for the live-debconfig "
"package in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/"
@@ -216,13 +231,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-debconfig.7:46 en/live-debconfig_hostname.5:71
+#: en/live-debconfig.7:48 en/live-debconfig_hostname.5:71
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-debconfig.7:47 en/live-debconfig_hostname.5:72
+#: en/live-debconfig.7:49 en/live-debconfig_hostname.5:72
msgid ""
"live-debconfig was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
msgstr ""
diff --git a/manpages/po/de/live-debconfig_hostname.5.po b/manpages/po/de/live-debconfig_hostname.5.po
index 3445e27..58404fe 100644
--- a/manpages/po/de/live-debconfig_hostname.5.po
+++ b/manpages/po/de/live-debconfig_hostname.5.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-debconfig 4.0~a2-1\n"
-"POT-Creation-Date: 2012-08-10 23:08+0300\n"
+"POT-Creation-Date: 2012-08-16 14:13+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,8 +24,8 @@ msgstr "LIVE-DEBCONFIG"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "2012-08-10"
-msgstr "10.08.2012"
+msgid "2012-08-16"
+msgstr "16.08.2012"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
@@ -61,39 +61,39 @@ msgstr ""
"des Buildvorganges (live-build) konfigurieren."
#. type: SH
-#: en/live-debconfig.7:31 en/live-debconfig_hostname.5:54
+#: en/live-debconfig.7:33 en/live-debconfig_hostname.5:54
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-debconfig.7:33 en/live-debconfig_hostname.5:56
+#: en/live-debconfig.7:35 en/live-debconfig_hostname.5:56
msgid "I<live-boot>(7)"
msgstr "I<live-boot>(7)"
#. type: Plain text
-#: en/live-debconfig.7:35 en/live-debconfig_hostname.5:58
+#: en/live-debconfig.7:37 en/live-debconfig_hostname.5:58
msgid "I<live-build>(7)"
msgstr "I<live-build>(7)"
#. type: Plain text
-#: en/live-debconfig.7:37 en/live-debconfig_hostname.5:60
+#: en/live-debconfig.7:39 en/live-debconfig_hostname.5:60
msgid "I<live-config>(7)"
msgstr "I<live-config>(7)"
#. type: Plain text
-#: en/live-debconfig.7:39 en/live-debconfig_hostname.5:64
+#: en/live-debconfig.7:41 en/live-debconfig_hostname.5:64
msgid "I<live-tools>(7)"
msgstr "I<live-tools>(7)"
#. type: SH
-#: en/live-debconfig.7:40 en/live-debconfig_hostname.5:65
+#: en/live-debconfig.7:42 en/live-debconfig_hostname.5:65
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-debconfig.7:42 en/live-debconfig_hostname.5:67
+#: en/live-debconfig.7:44 en/live-debconfig_hostname.5:67
msgid ""
"More information about live-debconfig and the Debian Live project can be "
"found on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the "
@@ -104,13 +104,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-debconfig.7:43 en/live-debconfig_hostname.5:68
+#: en/live-debconfig.7:45 en/live-debconfig_hostname.5:68
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-debconfig.7:45 en/live-debconfig_hostname.5:70
+#: en/live-debconfig.7:47 en/live-debconfig_hostname.5:70
msgid ""
"Bugs can be reported by submitting a bugreport for the live-debconfig "
"package in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/"
@@ -124,13 +124,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-debconfig.7:46 en/live-debconfig_hostname.5:71
+#: en/live-debconfig.7:48 en/live-debconfig_hostname.5:71
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-debconfig.7:47 en/live-debconfig_hostname.5:72
+#: en/live-debconfig.7:49 en/live-debconfig_hostname.5:72
msgid ""
"live-debconfig was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
msgstr ""
diff --git a/manpages/po/es/live-debconfig.7.po b/manpages/po/es/live-debconfig.7.po
index 8ef4c80..55b5ba8 100644
--- a/manpages/po/es/live-debconfig.7.po
+++ b/manpages/po/es/live-debconfig.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-debconfig 4.0~a2-1\n"
-"POT-Creation-Date: 2012-08-10 23:08+0300\n"
+"POT-Creation-Date: 2012-08-16 14:13+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,7 +24,7 @@ msgstr "LIVE-DEBCONFIG"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-16"
msgstr "2012-07-30"
#. type: TH
@@ -127,24 +127,37 @@ msgstr ""
#. type: IP
#: en/live-debconfig.7:26
#, no-wrap
+msgid "B<util-linux>"
+msgstr "B<util-linux>"
+
+#. type: Plain text
+#: en/live-debconfig.7:28
+msgid ""
+"configure the access to the hardware clock, see I<live-debconfig_util-linux>"
+"(5)."
+msgstr ""
+
+#. type: IP
+#: en/live-debconfig.7:28
+#, no-wrap
msgid "B<selinux>"
msgstr "B<selinux>"
#. type: Plain text
-#: en/live-debconfig.7:28
+#: en/live-debconfig.7:30
msgid ""
"enables or disables selinux (/selinux), see I<live-debconfig_selinux>(5)."
msgstr ""
"activa o desactiva selinux (/selinux), ver I<live-debconfig_selinux>(5)."
#. type: IP
-#: en/live-debconfig.7:28
+#: en/live-debconfig.7:30
#, no-wrap
msgid "B<openssh-server>"
msgstr "B<openssh-server>"
#. type: Plain text
-#: en/live-debconfig.7:30
+#: en/live-debconfig.7:32
msgid ""
"recreates openssh-server host keys (/etc/ssh/ssh_host_key*), see I<live-"
"debconfig_openssh-server>(5)."
@@ -153,39 +166,39 @@ msgstr ""
"ver I<live-debconfig_openssh-server>(5)."
#. type: SH
-#: en/live-debconfig.7:31 en/live-debconfig_hostname.5:54
+#: en/live-debconfig.7:33 en/live-debconfig_hostname.5:54
#, no-wrap
msgid "SEE ALSO"
msgstr "VER TAMBIÉN"
#. type: Plain text
-#: en/live-debconfig.7:33 en/live-debconfig_hostname.5:56
+#: en/live-debconfig.7:35 en/live-debconfig_hostname.5:56
msgid "I<live-boot>(7)"
msgstr "I<live-boot>(7)"
#. type: Plain text
-#: en/live-debconfig.7:35 en/live-debconfig_hostname.5:58
+#: en/live-debconfig.7:37 en/live-debconfig_hostname.5:58
msgid "I<live-build>(7)"
msgstr "I<live-build>(7)"
#. type: Plain text
-#: en/live-debconfig.7:37 en/live-debconfig_hostname.5:60
+#: en/live-debconfig.7:39 en/live-debconfig_hostname.5:60
msgid "I<live-config>(7)"
msgstr "I<live-config>(7)"
#. type: Plain text
-#: en/live-debconfig.7:39 en/live-debconfig_hostname.5:64
+#: en/live-debconfig.7:41 en/live-debconfig_hostname.5:64
msgid "I<live-tools>(7)"
msgstr "I<live-tools>(7)"
#. type: SH
-#: en/live-debconfig.7:40 en/live-debconfig_hostname.5:65
+#: en/live-debconfig.7:42 en/live-debconfig_hostname.5:65
#, no-wrap
msgid "HOMEPAGE"
msgstr "PÁGINA WEB"
#. type: Plain text
-#: en/live-debconfig.7:42 en/live-debconfig_hostname.5:67
+#: en/live-debconfig.7:44 en/live-debconfig_hostname.5:67
msgid ""
"More information about live-debconfig and the Debian Live project can be "
"found on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the "
@@ -196,13 +209,13 @@ msgstr ""
"en el manual en E<lt>I<http://live.debian.net/manual/>E<gt>."
#. type: SH
-#: en/live-debconfig.7:43 en/live-debconfig_hostname.5:68
+#: en/live-debconfig.7:45 en/live-debconfig_hostname.5:68
#, no-wrap
msgid "BUGS"
msgstr "ERRORES"
#. type: Plain text
-#: en/live-debconfig.7:45 en/live-debconfig_hostname.5:70
+#: en/live-debconfig.7:47 en/live-debconfig_hostname.5:70
msgid ""
"Bugs can be reported by submitting a bugreport for the live-debconfig "
"package in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/"
@@ -215,13 +228,13 @@ msgstr ""
"Debian Live a la dirección E<lt>I<debian-live at lists.debian.org>E<gt>."
#. type: SH
-#: en/live-debconfig.7:46 en/live-debconfig_hostname.5:71
+#: en/live-debconfig.7:48 en/live-debconfig_hostname.5:71
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-debconfig.7:47 en/live-debconfig_hostname.5:72
+#: en/live-debconfig.7:49 en/live-debconfig_hostname.5:72
msgid ""
"live-debconfig was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
msgstr ""
diff --git a/manpages/po/es/live-debconfig_hostname.5.po b/manpages/po/es/live-debconfig_hostname.5.po
index 158a3ad..c60922f 100644
--- a/manpages/po/es/live-debconfig_hostname.5.po
+++ b/manpages/po/es/live-debconfig_hostname.5.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-debconfig 4.0~a2-1\n"
-"POT-Creation-Date: 2012-08-10 23:08+0300\n"
+"POT-Creation-Date: 2012-08-16 14:13+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,7 +24,7 @@ msgstr "LIVE-DEBCONFIG"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-16"
msgstr "2012-07-30"
#. type: TH
@@ -61,39 +61,39 @@ msgstr ""
"durante el proceso de construcción (live-build)."
#. type: SH
-#: en/live-debconfig.7:31 en/live-debconfig_hostname.5:54
+#: en/live-debconfig.7:33 en/live-debconfig_hostname.5:54
#, no-wrap
msgid "SEE ALSO"
msgstr "VER TAMBIÉN"
#. type: Plain text
-#: en/live-debconfig.7:33 en/live-debconfig_hostname.5:56
+#: en/live-debconfig.7:35 en/live-debconfig_hostname.5:56
msgid "I<live-boot>(7)"
msgstr "I<live-boot>(7)"
#. type: Plain text
-#: en/live-debconfig.7:35 en/live-debconfig_hostname.5:58
+#: en/live-debconfig.7:37 en/live-debconfig_hostname.5:58
msgid "I<live-build>(7)"
msgstr "I<live-build>(7)"
#. type: Plain text
-#: en/live-debconfig.7:37 en/live-debconfig_hostname.5:60
+#: en/live-debconfig.7:39 en/live-debconfig_hostname.5:60
msgid "I<live-config>(7)"
msgstr "I<live-config>(7)"
#. type: Plain text
-#: en/live-debconfig.7:39 en/live-debconfig_hostname.5:64
+#: en/live-debconfig.7:41 en/live-debconfig_hostname.5:64
msgid "I<live-tools>(7)"
msgstr "I<live-tools>(7)"
#. type: SH
-#: en/live-debconfig.7:40 en/live-debconfig_hostname.5:65
+#: en/live-debconfig.7:42 en/live-debconfig_hostname.5:65
#, no-wrap
msgid "HOMEPAGE"
msgstr "PÁGINA WEB"
#. type: Plain text
-#: en/live-debconfig.7:42 en/live-debconfig_hostname.5:67
+#: en/live-debconfig.7:44 en/live-debconfig_hostname.5:67
msgid ""
"More information about live-debconfig and the Debian Live project can be "
"found on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the "
@@ -104,13 +104,13 @@ msgstr ""
"en el manual en E<lt>I<http://live.debian.net/manual/>E<gt>."
#. type: SH
-#: en/live-debconfig.7:43 en/live-debconfig_hostname.5:68
+#: en/live-debconfig.7:45 en/live-debconfig_hostname.5:68
#, no-wrap
msgid "BUGS"
msgstr "ERRORES"
#. type: Plain text
-#: en/live-debconfig.7:45 en/live-debconfig_hostname.5:70
+#: en/live-debconfig.7:47 en/live-debconfig_hostname.5:70
msgid ""
"Bugs can be reported by submitting a bugreport for the live-debconfig "
"package in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/"
@@ -123,13 +123,13 @@ msgstr ""
"Debian Live a la dirección E<lt>I<debian-live at lists.debian.org>E<gt>."
#. type: SH
-#: en/live-debconfig.7:46 en/live-debconfig_hostname.5:71
+#: en/live-debconfig.7:48 en/live-debconfig_hostname.5:71
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-debconfig.7:47 en/live-debconfig_hostname.5:72
+#: en/live-debconfig.7:49 en/live-debconfig_hostname.5:72
msgid ""
"live-debconfig was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
msgstr ""
diff --git a/manpages/pot/live-debconfig.7.pot b/manpages/pot/live-debconfig.7.pot
index a9038d0..c63633b 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-10 23:08+0300\n"
+"POT-Creation-Date: 2012-08-16 14:13+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,7 +25,7 @@ msgstr ""
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-16"
msgstr ""
#. type: TH
@@ -118,62 +118,75 @@ msgstr ""
#. type: IP
#: en/live-debconfig.7:26
#, no-wrap
-msgid "B<selinux>"
+msgid "B<util-linux>"
msgstr ""
#. type: Plain text
#: en/live-debconfig.7:28
msgid ""
-"enables or disables selinux (/selinux), see I<live-debconfig_selinux>(5)."
+"configure the access to the hardware clock, see I<live-debconfig_util-linux>"
+"(5)."
msgstr ""
#. type: IP
#: en/live-debconfig.7:28
#, no-wrap
-msgid "B<openssh-server>"
+msgid "B<selinux>"
msgstr ""
#. type: Plain text
#: en/live-debconfig.7:30
msgid ""
+"enables or disables selinux (/selinux), see I<live-debconfig_selinux>(5)."
+msgstr ""
+
+#. type: IP
+#: en/live-debconfig.7:30
+#, no-wrap
+msgid "B<openssh-server>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-debconfig.7:32
+msgid ""
"recreates openssh-server host keys (/etc/ssh/ssh_host_key*), see I<live-"
"debconfig_openssh-server>(5)."
msgstr ""
#. type: SH
-#: en/live-debconfig.7:31 en/live-debconfig_hostname.5:54
+#: en/live-debconfig.7:33 en/live-debconfig_hostname.5:54
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-debconfig.7:33 en/live-debconfig_hostname.5:56
+#: en/live-debconfig.7:35 en/live-debconfig_hostname.5:56
msgid "I<live-boot>(7)"
msgstr ""
#. type: Plain text
-#: en/live-debconfig.7:35 en/live-debconfig_hostname.5:58
+#: en/live-debconfig.7:37 en/live-debconfig_hostname.5:58
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
-#: en/live-debconfig.7:37 en/live-debconfig_hostname.5:60
+#: en/live-debconfig.7:39 en/live-debconfig_hostname.5:60
msgid "I<live-config>(7)"
msgstr ""
#. type: Plain text
-#: en/live-debconfig.7:39 en/live-debconfig_hostname.5:64
+#: en/live-debconfig.7:41 en/live-debconfig_hostname.5:64
msgid "I<live-tools>(7)"
msgstr ""
#. type: SH
-#: en/live-debconfig.7:40 en/live-debconfig_hostname.5:65
+#: en/live-debconfig.7:42 en/live-debconfig_hostname.5:65
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-debconfig.7:42 en/live-debconfig_hostname.5:67
+#: en/live-debconfig.7:44 en/live-debconfig_hostname.5:67
msgid ""
"More information about live-debconfig and the Debian Live project can be "
"found on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the "
@@ -181,13 +194,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-debconfig.7:43 en/live-debconfig_hostname.5:68
+#: en/live-debconfig.7:45 en/live-debconfig_hostname.5:68
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-debconfig.7:45 en/live-debconfig_hostname.5:70
+#: en/live-debconfig.7:47 en/live-debconfig_hostname.5:70
msgid ""
"Bugs can be reported by submitting a bugreport for the live-debconfig "
"package in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/"
@@ -196,13 +209,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-debconfig.7:46 en/live-debconfig_hostname.5:71
+#: en/live-debconfig.7:48 en/live-debconfig_hostname.5:71
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-debconfig.7:47 en/live-debconfig_hostname.5:72
+#: en/live-debconfig.7:49 en/live-debconfig_hostname.5:72
msgid ""
"live-debconfig was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
msgstr ""
diff --git a/manpages/pot/live-debconfig_hostname.5.pot b/manpages/pot/live-debconfig_hostname.5.pot
index 35fa003..f4afdd4 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-10 23:08+0300\n"
+"POT-Creation-Date: 2012-08-16 14:13+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,7 +25,7 @@ msgstr ""
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-16"
msgstr ""
#. type: TH
@@ -60,39 +60,39 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-debconfig.7:31 en/live-debconfig_hostname.5:54
+#: en/live-debconfig.7:33 en/live-debconfig_hostname.5:54
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-debconfig.7:33 en/live-debconfig_hostname.5:56
+#: en/live-debconfig.7:35 en/live-debconfig_hostname.5:56
msgid "I<live-boot>(7)"
msgstr ""
#. type: Plain text
-#: en/live-debconfig.7:35 en/live-debconfig_hostname.5:58
+#: en/live-debconfig.7:37 en/live-debconfig_hostname.5:58
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
-#: en/live-debconfig.7:37 en/live-debconfig_hostname.5:60
+#: en/live-debconfig.7:39 en/live-debconfig_hostname.5:60
msgid "I<live-config>(7)"
msgstr ""
#. type: Plain text
-#: en/live-debconfig.7:39 en/live-debconfig_hostname.5:64
+#: en/live-debconfig.7:41 en/live-debconfig_hostname.5:64
msgid "I<live-tools>(7)"
msgstr ""
#. type: SH
-#: en/live-debconfig.7:40 en/live-debconfig_hostname.5:65
+#: en/live-debconfig.7:42 en/live-debconfig_hostname.5:65
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-debconfig.7:42 en/live-debconfig_hostname.5:67
+#: en/live-debconfig.7:44 en/live-debconfig_hostname.5:67
msgid ""
"More information about live-debconfig and the Debian Live project can be "
"found on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the "
@@ -100,13 +100,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-debconfig.7:43 en/live-debconfig_hostname.5:68
+#: en/live-debconfig.7:45 en/live-debconfig_hostname.5:68
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-debconfig.7:45 en/live-debconfig_hostname.5:70
+#: en/live-debconfig.7:47 en/live-debconfig_hostname.5:70
msgid ""
"Bugs can be reported by submitting a bugreport for the live-debconfig "
"package in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/"
@@ -115,13 +115,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-debconfig.7:46 en/live-debconfig_hostname.5:71
+#: en/live-debconfig.7:48 en/live-debconfig_hostname.5:71
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-debconfig.7:47 en/live-debconfig_hostname.5:72
+#: en/live-debconfig.7:49 en/live-debconfig_hostname.5:72
msgid ""
"live-debconfig was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
msgstr ""
diff --git a/scripts/debconfig/0040-util-linux b/scripts/debconfig/0040-util-linux
new file mode 100755
index 0000000..ffd7cf8
--- /dev/null
+++ b/scripts/debconfig/0040-util-linux
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+## live-debconfig(7) - System Configuration Scripts
+## Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
+##
+## This program 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.
+
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+Defaults ()
+{
+ if [ -z "${_HWCLOCKACCESS}" ]
+ then
+ if [ -e /etc/default/hwclock ]
+ then
+ . /etc/default/hwclock
+
+ _HWCLOCKACCESS="${_HWCLOCKACCESS:-${HWCLOCKACCESS}}"
+ fi
+
+ _HWCLOCKACCESS="${_HWCLOCKACCESS:-yes}"
+ fi
+}
+
+# /etc/default/hwclock is supported as of util-linux version 2.20.1-5
+_UTIL_LINUX_VERSION="$(dpkg -l util-linux | awk '/^ii/ { print $3 }')"
+
+if ! dpkg --compare-versions ${_UTIL_LINUX_VERSION} lt 2.20.1-5~
+then
+ exit 0
+fi
+
+db_get live-debconfig/util-linux/hwclockaccess
+_HWCLOCKACCESS="${RET}" # boolean
+
+Defaults
+
+db_set live-debconfig/util-linux/hwclockaccess "${_HWCLOCKACCESS}"
+db_fset live-debconfig/util-linux/hwclockaccess seen false
+
+db_settitle live-debconfig/title
+db_input high live-debconfig/util-linux/hwclockaccess || true
+db_go
+
+db_get live-debconfig/util-linux/hwclockaccess
+_HWCLOCKACCESS="${RET}" # boolean
+
+Defaults
+
+db_stop
+
+# translate debconf boolean into 'yes' and 'no'
+# (this is better than using a select in debconf with Choices-C,
+# otherwise all translators would need to translate 'yes' and 'no').
+case "${_HWCLOCKACCESS}" in
+ true)
+ _HWCLOCKACCESS="yes"
+ ;;
+
+ false)
+ _HWCLOCKACCESS="no"
+ ;;
+esac
+
+# HWCLOCKACCESS is commented in /etc/default/hwclock
+if [ -z "${HWCLOCKACCESS}" ]
+then
+ # uncommenting it
+ sed -i -e "s|^# *HWCLOCKACCESS=|HWCLOCKACCESS=|" \
+ /etc/default/hwclock
+fi
+
+# Set the hwclock parameters
+grep -Eq '^ *HWCLOCKACCESS=' /etc/default/hwclock || \
+ echo "HWCLOCKACCESS=" >> /etc/default/hwclock
+
+sed -i -e "s|^ *HWCLOCKACCESS=.*|HWCLOCKACCESS=\"${_HWCLOCKACCESS}\"|" \
+ /etc/default/hwclock
diff --git a/scripts/debconfig/0040-util-linux.templates b/scripts/debconfig/0040-util-linux.templates
new file mode 100644
index 0000000..5e25c52
--- /dev/null
+++ b/scripts/debconfig/0040-util-linux.templates
@@ -0,0 +1,14 @@
+Template: live-debconfig/title
+Type: title
+Description: live-debconfig: System Configuration
+
+Template: live-debconfig/util-linux/hwclockaccess
+Type: boolean
+Default: yes
+Description: live-debconfig: access the hardware clock?
+ Is it possible to access the hardare clock?
+ .
+ On normal systems the hardware clock can be accessed. However, on Linux Containers
+ (LXC) by default the hardware clock can not be access from within the container.
+ .
+ The default value is yes.
--
live-debconfig
More information about the debian-live-changes
mailing list