webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Red active wurde nur bei pptp erstellt -> gefixt

Browse Source 
dhcp bei ipup und ifdown eingefuegt


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@619 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
maniacikarus
2007-06-09 10:02:53 +00:00
parent b04331d3e3
commit 621b327e2c
3 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/initscripts/init.d/net/ifdown
View File

@@ -35,15 +35,30 @@ then
NETADDRESS=${GREEN_NETADDRESS} BROADCAST=${GREEN_BROADCAST} \
/etc/rc.d/init.d/net/common/ipv4-static ${GREEN_DEV} down
if [ "${ENABLE_GREEN}" == "on" ]; then
boot_mesg "Bringing up dhcpd on device ${DEVICE}."
/etc/rc.d/init.d/net/common/dhcpd ${GREEN_DEV} down
fi
elif [ "$name" == "blue" ]; then
NAME=${name} ADDRESS=${BLUE_ADDRESS} NETMASK=${BLUE_NETMASK}\
NETADDRESS=${BLUE_NETADDRESS} BROADCAST=${BLUE_BROADCAST} \
/etc/rc.d/init.d/net/common/ipv4-static ${BLUE_DEV} down
if [ "${ENABLE_BLUE}" == "on" ]; then
boot_mesg "Bringing up dhcpd on device ${DEVICE}."
/etc/rc.d/init.d/net/common/dhcpd ${BLUE_DEV} down
fi
elif [ "$name" == "orange" ]; then
NAME=${name} ADDRESS=${ORANGE_ADDRESS} NETMASK=${ORANGE_NETMASK}\
NETADDRESS=${ORANGE_NETADDRESS} BROADCAST=${ORANGE_BROADCAST} \
/etc/rc.d/init.d/net/common/ipv4-static ${ORANGE_DEV} down
if [ "${ENABLE_ORANGE}" == "on" ]; then
boot_mesg "Bringing up dhcpd on device ${DEVICE}."
/etc/rc.d/init.d/net/common/dhcpd ${ORANGE_DEV} down
fi
elif [ "$name" == "red" ]; then
if [ "${RED_TYPE}" == "PPPOE" ]; then

16
src/initscripts/init.d/net/ifup
View File

@@ -24,6 +24,7 @@ boot_mesg_flush
(
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
if [ "$name" == "green" ]; then
DEVICE="${GREEN_DEV}"
@@ -62,17 +63,32 @@ boot_mesg_flush
NETADDRESS=${GREEN_NETADDRESS} BROADCAST=${GREEN_BROADCAST} \
/etc/rc.d/init.d/net/common/ipv4-static ${GREEN_DEV} up
fi
if [ "${ENABLE_GREEN}" == "on" ]; then
boot_mesg "Bringing up dhcpd on device ${DEVICE}."
/etc/rc.d/init.d/net/common/dhcpd ${GREEN_DEV} up
fi
elif [ "$name" == "blue" ]; then
NAME=${name} ADDRESS=${BLUE_ADDRESS} NETMASK=${BLUE_NETMASK} \
NETADDRESS=${BLUE_NETADDRESS} BROADCAST=${BLUE_BROADCAST} \
/etc/rc.d/init.d/net/common/ipv4-static ${BLUE_DEV} up
if [ "${ENABLE_BLUE}" == "on" ]; then
boot_mesg "Bringing up dhcpd on device ${DEVICE}."
/etc/rc.d/init.d/net/common/dhcpd ${BLUE_DEV} up
fi
elif [ "$name" == "orange" ]; then
NAME=${name} ADDRESS=${ORANGE_ADDRESS} NETMASK=${ORANGE_NETMASK} \
NETADDRESS=${ORANGE_NETADDRESS} BROADCAST=${ORANGE_BROADCAST} \
/etc/rc.d/init.d/net/common/ipv4-static ${ORANGE_DEV} up
if [ "${ENABLE_ORANGE}" == "on" ]; then
boot_mesg "Bringing up dhcpd on device ${DEVICE}."
/etc/rc.d/init.d/net/common/dhcpd ${ORANGE_DEV} up
fi
elif [ "$name" == "red" ]; then
if [ "${RED_TYPE}" == "PPPOE" ]; then
NAME=${name} /etc/rc.d/init.d/net/red/pppoe ${RED_DEV} up

4
src/initscripts/init.d/net/red/update
View File

@@ -70,9 +70,7 @@ if ( echo $0 | /bin/grep -q 'dhcpcd.exe' ); then
case "$2" in
up)
logger -p local0.info -t dhcpcd.exe[$$] "${INTERFACE} has been configured with old IP=${IPADDR}"
if [ "$RED_TYPE" != 'PPTP' ]; then
touch /var/ipfire/red/active
fi
;;
new)
logger -p local0.info -t dhcpcd.exe[$$] "${INTERFACE} has been configured with new IP=${IPADDR}"
@@ -87,9 +85,7 @@ if ( echo $0 | /bin/grep -q 'dhcpcd.exe' ); then
logger -p local0.info -t red[$$] "unlocking from $$"
exit 0
else
if [ "$RED_TYPE" != 'PPTP' ]; then
touch /var/ipfire/red/active
fi
fi
;;
down)