This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via 14e30babc3b5ee992ca440171b1c996955838fc8 (commit) from 3489c88cd8b6102fbdd474cf4752d4c88e483729 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 14e30babc3b5ee992ca440171b1c996955838fc8 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jun 18 22:24:49 2010 +0200
Remove newline from ip-address files if red=dhcp. fixes bug #0000658
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/38/filelists/files | 1 + src/initscripts/init.d/networking/dhcpcd.exe | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)
Difference in files: diff --git a/config/rootfiles/core/38/filelists/files b/config/rootfiles/core/38/filelists/files index 6390714..79ea431 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 d69f53d..0d06bcb 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
hooks/post-receive -- IPFire 2.x development tree