From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 20 Apr 2015 20:48:46 +0000 (+0200)
Subject: functions.network: update dhcp client commandline.
X-Git-Tag: v2.17-core91~116^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e28ecea3ef7b96ef55d9b3dc3ad67414c023853;p=people%2Fstevee%2Fipfire-2.x.git

functions.network: update dhcp client commandline.

this fix trailing space before hostname.
---

diff --git a/config/rootfiles/core/90/filelists/files b/config/rootfiles/core/90/filelists/files
index d346264d81..85d3de3358 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/src/initscripts/init.d/networking/functions.network b/src/initscripts/init.d/networking/functions.network
index f459b77759..1af3482df4 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.