Remove newline from ip-address files if red=dhcp.
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 18 Jun 2010 20:24:49 +0000 (22:24 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 18 Jun 2010 20:24:49 +0000 (22:24 +0200)
fixes bug #0000658

config/rootfiles/core/38/filelists/files
src/initscripts/init.d/networking/dhcpcd.exe

index 6390714..79ea431 100644 (file)
@@ -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
index d69f53d..0d06bcb 100644 (file)
@@ -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