[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 785c9195204b12f9391d3d13e56e7ec11576cfeb

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 4359 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  785c9195204b12f9391d3d13e56e7ec11576cfeb (commit)
       via  2e28ecea3ef7b96ef55d9b3dc3ad67414c023853 (commit)
      from  1245aa72df932f3764be1ba7c5ce09b89b79ac5e (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 785c9195204b12f9391d3d13e56e7ec11576cfeb
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon Apr 20 22:57:24 2015 +0200

    remove ipp2p patches.
    
    ipp2p is build by xtables addons now.

commit 2e28ecea3ef7b96ef55d9b3dc3ad67414c023853
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon Apr 20 22:48:46 2015 +0200

    functions.network: update dhcp client commandline.
    
    this fix trailing space before hostname.

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

Summary of changes:
 config/rootfiles/core/90/filelists/files                    | 1 +
 config/rootfiles/{oldcore/77 => core/90}/filelists/iptables | 0
 lfs/iptables                                                | 3 ---
 lfs/linux                                                   | 3 ---
 src/initscripts/init.d/networking/functions.network         | 4 ++--
 5 files changed, 3 insertions(+), 8 deletions(-)
 copy config/rootfiles/{oldcore/77 => core/90}/filelists/iptables (100%)

Difference in files:
diff --git a/config/rootfiles/core/90/filelists/files b/config/rootfiles/core/90/filelists/files
index d346264..85d3de3 100644
--- a/config/rootfiles/core/90/filelists/files
+++ b/config/rootfiles/core/90/filelists/files
@@ -2,6 +2,7 @@ etc/system-release
 etc/issue
 etc/rc.d/init.d/firewall
 etc/rc.d/init.d/network-trigger
+etc/rc.d/init.d/networking/functions.network
 etc/rc.d/init.d/networking/red.up/99-geoip-database
 etc/rc.d/rcsysinit.d/S90network-trigger
 srv/web/ipfire/cgi-bin/firewall.cgi
diff --git a/config/rootfiles/core/90/filelists/iptables b/config/rootfiles/core/90/filelists/iptables
new file mode 120000
index 0000000..8caf12b
--- /dev/null
+++ b/config/rootfiles/core/90/filelists/iptables
@@ -0,0 +1 @@
+../../../common/iptables
\ No newline at end of file
diff --git a/lfs/iptables b/lfs/iptables
index d3c8402..ec65ae0 100644
--- a/lfs/iptables
+++ b/lfs/iptables
@@ -93,9 +93,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && cp -vf $(DIR_SRC)/netfilter-layer7-v2.22/iptables-1.4.3forward-for-kernel-2.6.20forward/* \
 	                 ./extensions/
 
-	# ipp2p 0.8.2-pomng
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.14-ipp2p-0.8.2-ipfire.patch
-
 	# imq
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.12-IMQ-test4.diff
 
diff --git a/lfs/linux b/lfs/linux
index 300fd87..5675f95 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -118,9 +118,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Linux Intermediate Queueing Device
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-imq.patch
 
-	# ipp2p 0.8.2-ipfire
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10-ipp2p-0.8.2-ipfire.patch
-
 	# Layer7-patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14-layer7-filter.patch
 
diff --git a/src/initscripts/init.d/networking/functions.network b/src/initscripts/init.d/networking/functions.network
index f459b77..1af3482 100644
--- a/src/initscripts/init.d/networking/functions.network
+++ b/src/initscripts/init.d/networking/functions.network
@@ -75,7 +75,7 @@ dhcpcd_start() {
 	fi
 
 	# Start dhcpcd.
-	/sbin/dhcpcd "${device}" "${dhcp_start}" >/dev/null 2>&1
+	/sbin/dhcpcd ${dhcp_start} ${device} >/dev/null 2>&1
 	ret="$?"
 
 	if [ "${ret}" -eq 0 ]; then
@@ -124,7 +124,7 @@ dhcpcd_stop() {
 	fi
 
 	# Stop dhcpcd.
-	/sbin/dhcpcd "${device}" "${dhcp_stop}" &> /dev/null
+	/sbin/dhcpcd ${dhcp_stop} ${device} &> /dev/null
 	ret="$?"
 
 	# Wait until dhcpd has stopped.


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