Remove newline from ip-address files if red=dhcp.

[people/pmueller/ipfire-2.x.git] / src / initscripts / init.d / networking / dhcpcd.exe

diff --git a/src/initscripts/init.d/networking/dhcpcd.exe b/src/initscripts/init.d/networking/dhcpcd.exe
index d69f53d0b43d5bcdb58999467c14cca8769c1d68..0d06bcb1569561fdcec2f84bbefe1a50264f59c4 100644 (file)
--- a/src/initscripts/init.d/networking/dhcpcd.exe
+++ b/src/initscripts/init.d/networking/dhcpcd.exe
@@ -49,7 +49,7 @@ dhcpcd_up()
                fi
 
                #Get IP Address
-               echo "$new_ip_address"  > /var/ipfire/red/local-ipaddress
+               echo -n "$new_ip_address"  > /var/ipfire/red/local-ipaddress
 
                #Get default gateway
                grep -v " gateway$" /etc/hosts > /tmp/hosts
@@ -59,7 +59,7 @@ dhcpcd_up()
        fi
        if [ $update ]; then
                [ -e "/var/ipfire/red/active" ] || touch /var/ipfire/red/active
-               echo "$new_routers" > /var/ipfire/red/remote-ipaddress
+               echo -n "$new_routers" > /var/ipfire/red/remote-ipaddress
                logger -p local0.info -t dhcpcd.exe[$$] "$interface has been (re)configured with IP=$new_ip_address"
                run_subdir ${rc_base}/init.d/networking/red.up/
                touch /var/ipfire/red/active