From 14e30babc3b5ee992ca440171b1c996955838fc8 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 18 Jun 2010 22:24:49 +0200 Subject: [PATCH] Remove newline from ip-address files if red=dhcp. fixes bug #0000658 --- config/rootfiles/core/38/filelists/files | 1 + src/initscripts/init.d/networking/dhcpcd.exe | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/rootfiles/core/38/filelists/files b/config/rootfiles/core/38/filelists/files index 63907145b9..79ea431b11 100644 --- 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 d69f53d0b4..0d06bcb156 100644 --- 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 -- 2.39.2