webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-15 13:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

More DHCP Fixes.

Browse Source
This commit is contained in:
Arne Fitzenreiter
2010-01-05 15:25:18 +01:00
parent 7f8e589bf0
commit 5ba06eb81c
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,8 @@
. /etc/sysconfig/rc
. $rc_functions
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
eval $(/usr/local/bin/readhash /var/ipfire/dns/settings)
dhcpcd_up()
@@ -21,8 +23,8 @@ dhcpcd_up()
set | grep "^new_" | sed "s|^new_||g" | \
sort > /var/ipfire/dhcpc/dhcpcd-$interface.info
# If interface is not red0.8 (vdsl-iptv) update /var/ipfire/red
if [ "$interface" != "red0.8" ]; then
# Only if RED_TYPE=DHCP update /var/ipfire/red
if [ "$RED_TYPE" == "DHCP" ]; then
#Check if we have to restart the services at update
[ ! -e "/var/ipfire/red/active" ] update=1;
@@ -68,7 +70,9 @@ dhcpcd_down()
{
set | grep "^new_" | sed "s|^new_||g" | \
sort > /var/ipfire/dhcpc/dhcpcd-$interface.info
if [ "$interface" != "red0.8" ]; then
# Only if RED_TYPE=DHCP update /var/ipfire/red
if [ "$RED_TYPE" == "DHCP" ]; then
logger -p local0.info -t dhcpcd.exe[$$] "${interface} has been brought down"
rm -f /var/ipfire/red/active
run_subdir ${rc_base}/init.d/networking/red.down/

7
src/initscripts/init.d/networking/red
View File

@@ -249,9 +249,6 @@ case "${1}" in
if [ "${RED_VDSL_IPTV_DISABLE}" == "0" ]; then
PIDFILE="/var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid"
LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info"
# Don't startup services ...
DHCP_START="-C 70 "
DHCP_STOP="-k "
# Test to see if there is a stale pid file
if [ -f "$PIDFILE" ]; then
ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null
@@ -320,10 +317,6 @@ case "${1}" in
ip addr flush dev $PPP_NIC >/dev/null 2>&1
if [ "$TYPE" == "pptp" ]; then
if [ "$PPTP_NICCFG" == "dhcp" ]; then
# Don't startup services ...
DHCP_START="-C 70 "
DHCP_STOP="-k "
# Test to see if there is a stale pid file
if [ -f "$PIDFILE" ]; then
ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null