From mboxrd@z Thu Jan 1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
1075e0b5f0c08695a839462c5609e919d24b8a5c
Date: Thu, 29 Nov 2012 11:02:17 +0100
Message-ID: <20121129100217.8007420259@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4107274816528247642=="
List-Id: <ipfire-scm.lists.ipfire.org>
--===============4107274816528247642==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 1075e0b5f0c08695a839462c5609e919d24b8a5c (commit)
from 79d29f0082a0f97313c4cf8ec2696281785069bb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1075e0b5f0c08695a839462c5609e919d24b8a5c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Nov 29 11:01:34 2012 +0100
core 65: Don't replace crontab.
=20
Just update the necessary bits because users may probably
have added their own configurations.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/65/filelists/files | 1 -
config/rootfiles/core/65/update.sh | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core=
/65/filelists/files
index 91272a4..6c88a31 100644
--- a/config/rootfiles/core/65/filelists/files
+++ b/config/rootfiles/core/65/filelists/files
@@ -7,4 +7,3 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi
usr/sbin/ovpn-ccd-convert
var/ipfire/general-functions.pl
var/ipfire/langs
-var/spool/cron/root.orig
diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/core/65/up=
date.sh
index fca7211..88f5b36 100644
--- a/config/rootfiles/core/65/update.sh
+++ b/config/rootfiles/core/65/update.sh
@@ -49,7 +49,9 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLa=
ng"
# Convert OpenVPN RW connections.
/usr/sbin/ovpn-ccd-convert
=20
-# Re-read crontab.
+# Update crontab.
+sed -i /var/spool/cron/root.orig \
+ -e 's@^.*fcron.weekly.*$@\&nice(10),bootrun 47 2 \* \* 1\ttest -x /usr/loca=
l/bin/run-parts \&\& /usr/local/bin/run-parts /etc/fcron.weekly@'
fcrontab -z &>/dev/null
=20
# Reload apache configuration.
hooks/post-receive
--
IPFire 2.x development tree
--===============4107274816528247642==--