[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 1876ad1a9b0d7239387bc601c352c959abf494ce
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Jun 7 15:43:01 2010 +0200

    Adding anacron script.

diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 624927b..4c0135c 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -250,6 +250,8 @@ räumt dem Benutzer Privilegien durch policykit ein.
 erneuert SSL snake\-oil Zertifikate.
 .IP \fBupdate\-notifier\fP 4
 schaltet update\-notifier ab.
+.IP \fBanacron\fP 4
+schaltet anacron aus.
 .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 887ed8f..e624fc8 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -165,6 +165,8 @@ grant user privilegies through policykit.
 regenerating ssl snake\-oil certificates.
 .IP "\fBupdate\-notifier\fR" 4
 disables update\-notifier.
+.IP "\fBanacron\fR" 4
+disables anacron.
 .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 644062b..50926ee 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:36+0300\n"
+"POT-Creation-Date: 2010-06-07 15:42+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"
@@ -1017,11 +1017,22 @@ msgstr "schaltet update-notifier ab."
 #. type: IP
 #: en/live-config.7:168
 #, no-wrap
+msgid "B<anacron>"
+msgstr "B<anacron>"
+
+#. type: Plain text
+#: en/live-config.7:170
+msgid "disables anacron."
+msgstr "schaltet anacron aus."
+
+#. type: IP
+#: en/live-config.7:170
+#, no-wrap
 msgid "B<hooks>"
 msgstr "B<hooks>"
 
 #. type: Plain text
-#: en/live-config.7:170
+#: en/live-config.7:172
 msgid ""
 "allows to run arbitrary commands from a script placed on the live media or "
 "an http/ftp server."
@@ -1030,77 +1041,77 @@ msgstr ""
 "einem HTTP/FTP Server auszuführen."
 
 #. type: SH
-#: en/live-config.7:171
+#: en/live-config.7:173
 #, no-wrap
 msgid "FILES"
 msgstr "DATEIEN"
 
 #. type: IP
-#: en/live-config.7:172
+#: en/live-config.7:174
 #, no-wrap
 msgid "B</etc/live/config.conf>"
 msgstr "B</etc/live/config.conf>"
 
 #. type: IP
-#: en/live-config.7:173
+#: en/live-config.7:175
 #, no-wrap
 msgid "B</etc/live/config.conf.d/>"
 msgstr "B</etc/live/config.conf.d/>"
 
 #. type: IP
-#: en/live-config.7:174
+#: en/live-config.7:176
 #, no-wrap
 msgid "B<live/config.conf>"
 msgstr "B<live/config.conf>"
 
 #. type: IP
-#: en/live-config.7:175
+#: en/live-config.7:177
 #, no-wrap
 msgid "B<live/config.conf.d/>"
 msgstr "B<live/config.conf.d/>"
 
 #. type: IP
-#: en/live-config.7:176
+#: en/live-config.7:178
 #, no-wrap
 msgid "B</lib/live/config.sh>"
 msgstr "B</lib/live/config.sh>"
 
 #. type: IP
-#: en/live-config.7:177
+#: en/live-config.7:179
 #, no-wrap
 msgid "B</lib/live/config/>"
 msgstr "B</lib/live/config/>"
 
 #. type: IP
-#: en/live-config.7:178
+#: en/live-config.7:180
 #, no-wrap
 msgid "B</var/lib/live/config/>"
 msgstr "B</var/lib/live/config/>"
 
 #. type: SH
-#: en/live-config.7:180
+#: en/live-config.7:182
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
 
 #. type: Plain text
-#: en/live-config.7:182
+#: en/live-config.7:184
 msgid "I<live-boot>(7)"
 msgstr "I<live-boot>(7)"
 
 #. type: Plain text
-#: en/live-config.7:184
+#: en/live-config.7:186
 msgid "I<live-helper>(7)"
 msgstr "I<live-helper>(7)"
 
 #. type: SH
-#: en/live-config.7:185
+#: en/live-config.7:187
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "HOMEPAGE"
 
 #. type: Plain text
-#: en/live-config.7:187
+#: en/live-config.7:189
 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 "
@@ -1111,13 +1122,13 @@ msgstr ""
 "unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
 
 #. type: SH
-#: en/live-config.7:188
+#: en/live-config.7:190
 #, no-wrap
 msgid "BUGS"
 msgstr "FEHLER"
 
 #. type: Plain text
-#: en/live-config.7:190
+#: en/live-config.7:192
 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 "
@@ -1131,13 +1142,13 @@ msgstr ""
 "werden."
 
 #. type: SH
-#: en/live-config.7:191
+#: en/live-config.7:193
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: en/live-config.7:192
+#: en/live-config.7:194
 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 34590af..2b76b6c 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:36+0300\n"
+"POT-Creation-Date: 2010-06-07 15:42+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"
@@ -895,88 +895,99 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:168
 #, no-wrap
-msgid "B<hooks>"
+msgid "B<anacron>"
 msgstr ""
 
 #. type: Plain text
 #: en/live-config.7:170
+msgid "disables anacron."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:170
+#, no-wrap
+msgid "B<hooks>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:172
 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:171
+#: en/live-config.7:173
 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:172
+#: en/live-config.7:174
 #, no-wrap
 msgid "B</etc/live/config.conf>"
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:173
+#: en/live-config.7:175
 #, no-wrap
 msgid "B</etc/live/config.conf.d/>"
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:174
+#: en/live-config.7:176
 #, no-wrap
 msgid "B<live/config.conf>"
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:175
+#: en/live-config.7:177
 #, no-wrap
 msgid "B<live/config.conf.d/>"
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:176
+#: en/live-config.7:178
 #, no-wrap
 msgid "B</lib/live/config.sh>"
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:177
+#: en/live-config.7:179
 #, no-wrap
 msgid "B</lib/live/config/>"
 msgstr ""
 
 #. type: IP
-#: en/live-config.7:178
+#: en/live-config.7:180
 #, no-wrap
 msgid "B</var/lib/live/config/>"
 msgstr ""
 
 #. type: SH
-#: en/live-config.7:180
+#: en/live-config.7:182
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:182
+#: en/live-config.7:184
 msgid "I<live-boot>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:184
+#: en/live-config.7:186
 msgid "I<live-helper>(7)"
 msgstr ""
 
 #. type: SH
-#: en/live-config.7:185
+#: en/live-config.7:187
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:187
+#: en/live-config.7:189
 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 "
@@ -984,13 +995,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-config.7:188
+#: en/live-config.7:190
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:190
+#: en/live-config.7:192
 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 "
@@ -999,13 +1010,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-config.7:191
+#: en/live-config.7:193
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: en/live-config.7:192
+#: en/live-config.7:194
 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/113-anacron b/scripts/config/113-anacron
new file mode 100755
index 0000000..5fa92d0
--- /dev/null
+++ b/scripts/config/113-anacron
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# live-config(7) - System Configuration Scripts
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+#
+# live-config 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.
+
+
+Anacron ()
+{
+	# Checking if package is installed
+	if [ ! -e /var/lib/dpkg/info/anacron.list ] || \
+	   [ -e /var/lib/live/config/anacron ]
+	then
+		return
+	fi
+
+	echo -n " anacron"
+
+	Configure_anacron
+}
+
+Configure_anacron ()
+{
+	# This has the nice side effect of the cron.{daily,weekly,monthly} jobs
+	# in /etc/crontab remaining disabled, yet also not run by anacron
+	dpkg-divert --quiet --package live-config --add --rename --divert /usr/sbin/anacron.debian /usr/sbin/anacron
+
+	ln -s /bin/true /usr/sbin/anacron
+
+	# Creating state file
+	touch /var/lib/live/config/anacron
+}
+
+Anacron

-- 
live-config



More information about the debian-live-changes mailing list