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, master, updated.
38b7997ffdb0b0257a6502e9e531874acd711539
Date: Thu, 15 Oct 2015 13:03:39 +0200
Message-ID: <20151015110340.5C9CC21287@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3312948502671318130=="
List-Id: <ipfire-scm.lists.ipfire.org>
--===============3312948502671318130==
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, master has been updated
via 38b7997ffdb0b0257a6502e9e531874acd711539 (commit)
via ee97ade8e40ece29913a2bd5af59cf94fe4941b1 (commit)
via 13adb7aea82dca7002419517fea038d70f3defc0 (commit)
from c5a5e4abb043abe1c5cecbdf15b28b03f74f4734 (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 38b7997ffdb0b0257a6502e9e531874acd711539
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 15 12:02:38 2015 +0100
core94: Adjust update.sh script if run multiple times
=20
Some changes cannot be executed again after the update
was already installed.
=20
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ee97ade8e40ece29913a2bd5af59cf94fe4941b1
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Thu Oct 15 12:18:28 2015 +0200
Core94: fix for dma when postfix is installed
=20
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 13adb7aea82dca7002419517fea038d70f3defc0
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Thu Oct 15 12:18:27 2015 +0200
Core94: fix update.sh for dma
=20
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/94/update.sh | 11 +++++++++++
1 file changed, 11 insertions(+)
Difference in files:
diff --git a/config/rootfiles/core/94/update.sh b/config/rootfiles/core/94/up=
date.sh
index 6560662..e6f9cf1 100644
--- a/config/rootfiles/core/94/update.sh
+++ b/config/rootfiles/core/94/update.sh
@@ -70,6 +70,17 @@ EOF
=20
fcrontab -z &>/dev/null
=20
+# DMA - reconfigure Postfix if exists
+if [ -e /etc/postfix/main.cf ] && [ ! -e "/usr/sbin/sendmail.postfix" ]; then
+ mv /usr/sbin/sendmail /usr/sbin/sendmail.postfix
+ /usr/sbin/alternatives --install /usr/sbin/sendmail sendmail /usr/sbin/send=
mail.postfix 15
+ sed -i 's/usr\/sbin\/sendmail/usr/sbin/sendmail.postfix/' /opt/pakfire/db/r=
ootfiles/postfix
+fi
+# DMA - configure dma as default mta
+mkdir -p /etc/alternatives
+mkdir -p /var/lib/alternatives
+/usr/sbin/alternatives --install /usr/sbin/sendmail sendmail /usr/sbin/sendm=
ail.dma 20
+
# Start services
/etc/init.d/dnsmasq start
/etc/init.d/sshd start
hooks/post-receive
--
IPFire 2.x development tree
--===============3312948502671318130==--