webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
fixes bug #0000658
This commit is contained in:
Arne Fitzenreiter
2010-06-18 22:24:49 +02:00
parent 3489c88cd8
commit 14e30babc3
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/38/filelists/files
View File

@@ -6,6 +6,7 @@ etc/rc.d/init.d/leds
etc/rc.d/init.d/rc etc/rc.d/init.d/rc
etc/rc.d/init.d/snort etc/rc.d/init.d/snort
etc/rc.d/init.d/networking/red.up/50-ovpn 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/K78snort
etc/rc.d/rc0.d/K79leds etc/rc.d/rc0.d/K79leds
etc/rc.d/rc3.d/S21leds etc/rc.d/rc3.d/S21leds

4
src/initscripts/init.d/networking/dhcpcd.exe
View File

@@ -49,7 +49,7 @@ dhcpcd_up()
fi fi
#Get IP Address #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 #Get default gateway
grep -v " gateway$" /etc/hosts > /tmp/hosts grep -v " gateway$" /etc/hosts > /tmp/hosts
@@ -59,7 +59,7 @@ dhcpcd_up()
fi fi
if [ $update ]; then if [ $update ]; then
[ -e "/var/ipfire/red/active" ] || touch /var/ipfire/red/active [ -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" 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/ run_subdir ${rc_base}/init.d/networking/red.up/
touch /var/ipfire/red/active touch /var/ipfire/red/active