[SCM] live-config branch, debian-next, updated. debian/2.0_a5-1-15-g99e0eee
Daniel Baumann
daniel at debian.org
Mon Jun 7 13:55:18 UTC 2010
The following commit has been merged in the debian-next branch:
commit 260e3aa5d71902c3d0542ac8bdd86196b5ed6970
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jun 7 15:49:40 2010 +0200
Adding util-linux script.
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 4c0135c..ecafb29 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -252,6 +252,8 @@ erneuert SSL snake\-oil Zertifikate.
schaltet update\-notifier ab.
.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 e624fc8..7a75869 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -167,6 +167,8 @@ regenerating ssl snake\-oil certificates.
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.
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index 50926ee..484f608 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 2.0~a5\n"
-"POT-Creation-Date: 2010-06-07 15:42+0300\n"
+"POT-Creation-Date: 2010-06-07 15: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"
@@ -860,7 +860,7 @@ msgstr "konfiguriert die Tastatur."
#: en/live-config.7:140
#, no-wrap
msgid "B<sysvinit>"
-msgstr ""
+msgstr "B<sysvinit>"
#. type: Plain text
#: en/live-config.7:142
@@ -1028,11 +1028,22 @@ msgstr "schaltet anacron aus."
#. type: IP
#: en/live-config.7:170
#, no-wrap
+msgid "B<util-linux>"
+msgstr "B<util-linux>"
+
+#. type: Plain text
+#: en/live-config.7:172
+msgid "disables util-linux' hwclock."
+msgstr "schaltet hwclock von util-linux ab."
+
+#. type: IP
+#: en/live-config.7:172
+#, no-wrap
msgid "B<hooks>"
msgstr "B<hooks>"
#. type: Plain text
-#: en/live-config.7:172
+#: en/live-config.7:174
msgid ""
"allows to run arbitrary commands from a script placed on the live media or "
"an http/ftp server."
@@ -1041,77 +1052,77 @@ msgstr ""
"einem HTTP/FTP Server auszuführen."
#. type: SH
-#: en/live-config.7:173
+#: en/live-config.7:175
#, no-wrap
msgid "FILES"
msgstr "DATEIEN"
#. type: IP
-#: en/live-config.7:174
+#: en/live-config.7:176
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr "B</etc/live/config.conf>"
#. type: IP
-#: en/live-config.7:175
+#: en/live-config.7:177
#, no-wrap
msgid "B</etc/live/config.conf.d/>"
msgstr "B</etc/live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:176
+#: en/live-config.7:178
#, no-wrap
msgid "B<live/config.conf>"
msgstr "B<live/config.conf>"
#. type: IP
-#: en/live-config.7:177
+#: en/live-config.7:179
#, no-wrap
msgid "B<live/config.conf.d/>"
msgstr "B<live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:178
+#: en/live-config.7:180
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr "B</lib/live/config.sh>"
#. type: IP
-#: en/live-config.7:179
+#: en/live-config.7:181
#, no-wrap
msgid "B</lib/live/config/>"
msgstr "B</lib/live/config/>"
#. type: IP
-#: en/live-config.7:180
+#: en/live-config.7:182
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr "B</var/lib/live/config/>"
#. type: SH
-#: en/live-config.7:182
+#: en/live-config.7:184
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-config.7:184
+#: en/live-config.7:186
msgid "I<live-boot>(7)"
msgstr "I<live-boot>(7)"
#. type: Plain text
-#: en/live-config.7:186
+#: en/live-config.7:188
msgid "I<live-helper>(7)"
msgstr "I<live-helper>(7)"
#. type: SH
-#: en/live-config.7:187
+#: en/live-config.7:189
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-config.7:189
+#: en/live-config.7:191
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 "
@@ -1122,13 +1133,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-config.7:190
+#: en/live-config.7:192
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-config.7:192
+#: en/live-config.7:194
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 "
@@ -1142,13 +1153,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-config.7:193
+#: en/live-config.7:195
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-config.7:194
+#: en/live-config.7:196
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 2b76b6c..6e54dde 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-07 15:42+0300\n"
+"POT-Creation-Date: 2010-06-07 15: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"
@@ -906,88 +906,99 @@ msgstr ""
#. type: IP
#: en/live-config.7:170
#, no-wrap
-msgid "B<hooks>"
+msgid "B<util-linux>"
msgstr ""
#. type: Plain text
#: en/live-config.7:172
+msgid "disables util-linux' hwclock."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:172
+#, no-wrap
+msgid "B<hooks>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:174
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:173
+#: en/live-config.7:175
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/live-config.7:174
+#: en/live-config.7:176
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:175
+#: en/live-config.7:177
#, no-wrap
msgid "B</etc/live/config.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-config.7:176
+#: en/live-config.7:178
#, no-wrap
msgid "B<live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:177
+#: en/live-config.7:179
#, no-wrap
msgid "B<live/config.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-config.7:178
+#: en/live-config.7:180
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr ""
#. type: IP
-#: en/live-config.7:179
+#: en/live-config.7:181
#, no-wrap
msgid "B</lib/live/config/>"
msgstr ""
#. type: IP
-#: en/live-config.7:180
+#: en/live-config.7:182
#, no-wrap
msgid "B</var/lib/live/config/>"
msgstr ""
#. type: SH
-#: en/live-config.7:182
+#: en/live-config.7:184
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-config.7:184
+#: en/live-config.7:186
msgid "I<live-boot>(7)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:186
+#: en/live-config.7:188
msgid "I<live-helper>(7)"
msgstr ""
#. type: SH
-#: en/live-config.7:187
+#: en/live-config.7:189
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-config.7:189
+#: en/live-config.7:191
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 "
@@ -995,13 +1006,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:190
+#: en/live-config.7:192
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-config.7:192
+#: en/live-config.7:194
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 "
@@ -1010,13 +1021,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:193
+#: en/live-config.7:195
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-config.7:194
+#: en/live-config.7:196
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/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..defe4b2 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
--
live-config
More information about the debian-live-changes
mailing list