[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 42c545b1f5848767251cffc9ffb6d29b3cd7a4c3

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 42c545b1f5848767251cffc9ffb6d29b3cd7a4c3

[git]

[-- Attachment #1: Type: text/plain, Size: 3096 bytes --]

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  42c545b1f5848767251cffc9ffb6d29b3cd7a4c3 (commit)
       via  4a0e9b63184ad7dc280299d6619fd91e91d0f895 (commit)
      from  5604dc748d0c38a05d2f909aedbe50d8d05684e7 (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 42c545b1f5848767251cffc9ffb6d29b3cd7a4c3
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Mar 7 10:18:50 2015 +0100

    set version to 2.17-core88.

commit 4a0e9b63184ad7dc280299d6619fd91e91d0f895
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Mar 7 10:17:17 2015 +0100

    initskripts: rootfile update.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/armv5tel/initscripts | 1 +
 config/rootfiles/common/i586/initscripts     | 1 +
 make.sh                                      | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 config/rootfiles/common/armv5tel/initscripts
 mode change 100755 => 100644 config/rootfiles/common/i586/initscripts

Difference in files:
diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
old mode 100755
new mode 100644
index 53bc64f..5248766
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -34,6 +34,7 @@ etc/rc.d/init.d/firstsetup
 etc/rc.d/init.d/functions
 #etc/rc.d/init.d/gnump3d
 etc/rc.d/init.d/halt
+#etc/rc.d/init.d/haproxy
 #etc/rc.d/init.d/hostapd
 #etc/rc.d/init.d/imspector
 etc/rc.d/init.d/ipsec
diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
old mode 100755
new mode 100644
index 7bab7c4..845ae50
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -36,6 +36,7 @@ etc/rc.d/init.d/firstsetup
 etc/rc.d/init.d/functions
 #etc/rc.d/init.d/gnump3d
 etc/rc.d/init.d/halt
+#etc/rc.d/init.d/haproxy
 #etc/rc.d/init.d/hostapd
 #etc/rc.d/init.d/imspector
 etc/rc.d/init.d/ipsec
diff --git a/make.sh b/make.sh
index 7d41b59..d049888 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.17"							# Version number
-CORE="87"							# Core Level (Filename)
-PAKFIRE_CORE="87"						# Core Level (PAKFIRE)
+CORE="88"							# Core Level (Filename)
+PAKFIRE_CORE="88"						# 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