[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5daad7f6b25683d8fb893c7f9baaf1678b40f266

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5daad7f6b25683d8fb893c7f9baaf1678b40f266

[git]

[-- Attachment #1: Type: text/plain, Size: 5987 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, next has been updated
       via  5daad7f6b25683d8fb893c7f9baaf1678b40f266 (commit)
       via  dfa68452bedf80f82a20abc824a611d9a55ba3cb (commit)
       via  0f5c5ce72d42a236a44bcd45ed8aa718c596aca3 (commit)
      from  36d44213e93fadcd3fac982f14bacc61f4ce977d (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 5daad7f6b25683d8fb893c7f9baaf1678b40f266
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Feb 14 17:37:17 2014 +0100

    fireinfo: Update to 2.1.9.

commit dfa68452bedf80f82a20abc824a611d9a55ba3cb
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Feb 14 17:35:37 2014 +0100

    sysctl: Load variables first thing when booting.

commit 0f5c5ce72d42a236a44bcd45ed8aa718c596aca3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Feb 14 16:10:21 2014 +0100

    firewall: Load init script functions.

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

Summary of changes:
 config/rootfiles/common/armv5tel/initscripts | 2 +-
 config/rootfiles/common/i586/initscripts     | 2 +-
 config/rootfiles/core/76/update.sh           | 1 +
 lfs/fireinfo                                 | 4 ++--
 lfs/initscripts                              | 2 +-
 src/initscripts/init.d/firewall              | 3 +++
 6 files changed, 9 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index ba32ec8..531e612 100644
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -212,6 +212,7 @@ etc/rc.d/rc6.d/S90localnet
 etc/rc.d/rc6.d/S99reboot
 #etc/rc.d/rcsysinit.d
 etc/rc.d/rcsysinit.d/S00mountkernfs
+etc/rc.d/rcsysinit.d/S01sysctl
 etc/rc.d/rcsysinit.d/S05modules
 etc/rc.d/rcsysinit.d/S10udev
 etc/rc.d/rcsysinit.d/S19waitdrives
@@ -225,7 +226,6 @@ etc/rc.d/rcsysinit.d/S70console
 etc/rc.d/rcsysinit.d/S75firstsetup
 etc/rc.d/rcsysinit.d/S80localnet
 etc/rc.d/rcsysinit.d/S85firewall
-etc/rc.d/rcsysinit.d/S90sysctl
 etc/rc.d/rcsysinit.d/S91network-vlans
 etc/rc.d/rcsysinit.d/S92rngd
 etc/rc.d/rc3.d/S15fireinfo
diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index c95f496..a3acc1f 100644
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -218,6 +218,7 @@ etc/rc.d/rc6.d/S90localnet
 etc/rc.d/rc6.d/S99reboot
 #etc/rc.d/rcsysinit.d
 etc/rc.d/rcsysinit.d/S00mountkernfs
+etc/rc.d/rcsysinit.d/S01sysctl
 etc/rc.d/rcsysinit.d/S05modules
 etc/rc.d/rcsysinit.d/S10udev
 etc/rc.d/rcsysinit.d/S19checkfstab
@@ -232,7 +233,6 @@ etc/rc.d/rcsysinit.d/S70console
 etc/rc.d/rcsysinit.d/S75firstsetup
 etc/rc.d/rcsysinit.d/S80localnet
 etc/rc.d/rcsysinit.d/S85firewall
-etc/rc.d/rcsysinit.d/S90sysctl
 etc/rc.d/rcsysinit.d/S91network-vlans
 etc/rc.d/rcsysinit.d/S92rngd
 etc/rc.d/rc3.d/S15fireinfo
diff --git a/config/rootfiles/core/76/update.sh b/config/rootfiles/core/76/update.sh
index ba79d4b..2046a59 100644
--- a/config/rootfiles/core/76/update.sh
+++ b/config/rootfiles/core/76/update.sh
@@ -238,6 +238,7 @@ rm -rf /usr/lib/engines
 rm -f /etc/rc.d/init.d/networking/red.up/22-outgoingfwctrl
 rm -f /etc/rc.d/init.d/networking/red.up/25-portfw
 rm -f /etc/rc.d/init.d/networking/red.up/26-xtaccess
+rm -f /etc/rc.d/rcsysinit.d/S90sysctl
 
 # Remove old firewallscripts
 rm -f /usr/local/bin/setportfw
diff --git a/lfs/fireinfo b/lfs/fireinfo
index 802f485..a60aa53 100644
--- a/lfs/fireinfo
+++ b/lfs/fireinfo
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.1.8
+VER        = 2.1.9
 
 THISAPP    = fireinfo-v$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 594702e88a729ae0f35ef35d0786e22f
+$(DL_FILE)_MD5 = a4dbb3a4111f263b5059b2f76b14b32c
 
 install : $(TARGET)
 
diff --git a/lfs/initscripts b/lfs/initscripts
index 0b5d8f4..f9ee45f 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -157,6 +157,7 @@ $(TARGET) :
 	ln -sf ../init.d/leds        /etc/rc.d/rc6.d/K79leds
 	ln -sf ../init.d/fireinfo    /etc/rc.d/rc3.d/S15fireinfo
 	ln -sf ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernfs
+	ln -sf ../init.d/sysctl      /etc/rc.d/rcsysinit.d/S01sysctl
 	ln -sf ../init.d/modules     /etc/rc.d/rcsysinit.d/S05modules
 	ln -sf ../init.d/udev        /etc/rc.d/rcsysinit.d/S10udev
 	ln -sf ../init.d/waitdrives  /etc/rc.d/rcsysinit.d/S19waitdrives
@@ -172,7 +173,6 @@ $(TARGET) :
 	ln -sf ../init.d/firstsetup  /etc/rc.d/rcsysinit.d/S75firstsetup
 	ln -sf ../init.d/localnet    /etc/rc.d/rcsysinit.d/S80localnet
 	ln -sf ../init.d/firewall    /etc/rc.d/rcsysinit.d/S85firewall
-	ln -sf ../init.d/sysctl      /etc/rc.d/rcsysinit.d/S90sysctl
 	ln -sf ../init.d/network-vlans /etc/rc.d/rcsysinit.d/S91network-vlans
 	ln -sf ../init.d/rngd        /etc/rc.d/rcsysinit.d/S92rngd
 	ln -sf ../init.d/wlanclient  /etc/rc.d/rc0.d/K82wlanclient
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 1d4146d..4c9d875 100644
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+. /etc/sysconfig/rc
+. ${rc_functions}
+
 eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings)
 eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 eval $(/usr/local/bin/readhash /var/ipfire/optionsfw/settings)


hooks/post-receive
--
IPFire 2.x development tree