mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-17 06:23:00 +02:00
CGI fuer DHCP gefixt und if Skripte zurueckgesetzt
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@622 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
@@ -49,7 +49,8 @@ my @nosaved=();
|
||||
our $OptionTypes = 'boolean|((un)?signed )?integer (8|16|32)|ip-address|text|string|encapsulate \w+|array of ip-address';
|
||||
|
||||
&Header::showhttpheaders();
|
||||
our @ITFs=('GREEN','BLUE');
|
||||
our @ITFs=('GREEN');
|
||||
if (&Header::blue_used()){push(@ITFs,'BLUE');}
|
||||
|
||||
#Settings1 for the first screen box
|
||||
foreach my $itf (@ITFs) {
|
||||
|
||||
@@ -35,31 +35,16 @@ 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
|
||||
NAME=${name} /etc/rc.d/init.d/net/red/pppoe ${RED_DEV} down
|
||||
|
||||
@@ -24,7 +24,6 @@ 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}"
|
||||
@@ -64,31 +63,16 @@ boot_mesg_flush
|
||||
/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
|
||||
|
||||
Reference in New Issue
Block a user