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 6ec860b8d2f538fc28c8b56e45d82b1bd88514d3 (commit) via 595c6470dd2a3b6ad91169a405349cda3f00bd31 (commit) from c4791488a2c1e22a48baede5d7332a2467568a16 (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 6ec860b8d2f538fc28c8b56e45d82b1bd88514d3 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Sep 23 10:37:02 2017 +0200
finish core114
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 595c6470dd2a3b6ad91169a405349cda3f00bd31 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Sep 23 10:34:54 2017 +0200
core114: force update addons after core update
apache needs new vhost configs so all addons must updated to work with new apache.
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/114/update.sh | 21 +++++++++++++++++++++ make.sh | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-)
Difference in files: diff --git a/config/rootfiles/core/114/update.sh b/config/rootfiles/core/114/update.sh index 6d7a10b..ac59cc9 100644 --- a/config/rootfiles/core/114/update.sh +++ b/config/rootfiles/core/114/update.sh @@ -69,6 +69,27 @@ if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then ipsec start fi
+# +# After pakfire has ended run it again and update all addons +# this is needed for apache update. +# +echo '#!/bin/bash' > /tmp/pak_update +echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo 'touch /var/run/need_reboot ' >> /tmp/pak_update +# +killall -KILL pak_update +chmod +x /tmp/pak_update +/tmp/pak_update & + # This update need a reboot... touch /var/run/need_reboot
diff --git a/make.sh b/make.sh index fd1bbca..73b7b38 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.19" # Version number -CORE="113" # Core Level (Filename) -PAKFIRE_CORE="113" # Core Level (PAKFIRE) +CORE="114" # Core Level (Filename) +PAKFIRE_CORE="114" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir
hooks/post-receive -- IPFire 2.x development tree