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

fixes bug #0000658

diff --git a/config/rootfiles/core/38/filelists/files b/config/rootfiles/core/38/filelists/files
index 63907145b98e5c35f7e847d9e7f054d52c79f7dc..79ea431b11aa3035571718355795323fc7bbb30a 100644 (file)
--- a/config/rootfiles/core/38/filelists/files
+++ b/config/rootfiles/core/38/filelists/files
@@ -6,6 +6,7 @@ etc/rc.d/init.d/leds
 etc/rc.d/init.d/rc
 etc/rc.d/init.d/snort
 etc/rc.d/init.d/networking/red.up/50-ovpn
+etc/rc.d/init.d/networking/dhcpcd.exe
 etc/rc.d/rc0.d/K78snort
 etc/rc.d/rc0.d/K79leds
 etc/rc.d/rc3.d/S21leds

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