mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-22 08:52:58 +02:00
Update dhcpcd.
This commit is contained in:
Arne Fitzenreiter
@@ -1,38 +1,78 @@
|
||||
#!/bin/sh
|
||||
########################################################################
|
||||
# Begin
|
||||
#
|
||||
# Description : DHCP Client Script
|
||||
#
|
||||
# Authors : Michael Tremer - mitch@ipfire.org
|
||||
# Authors : Arne Fitzenreiter - arne_f@ipfire.org
|
||||
#
|
||||
# Version : 01.00
|
||||
# Version : 02.00
|
||||
#
|
||||
# Notes :
|
||||
#
|
||||
########################################################################
|
||||
|
||||
. /etc/sysconfig/rc
|
||||
. ${rc_functions}
|
||||
. /etc/sysconfig/rc
|
||||
. $rc_functions
|
||||
|
||||
eval $(/usr/local/bin/readhash "$1")
|
||||
case "$2" in
|
||||
up)
|
||||
logger -p local0.info -t dhcpcd.exe[$$] "${INTERFACE} has been configured with old IP=${IPADDR}"
|
||||
touch /var/ipfire/red/active
|
||||
run_subdir ${rc_base}/init.d/networking/red.up/
|
||||
;;
|
||||
new)
|
||||
logger -p local0.info -t dhcpcd.exe[$$] "${INTERFACE} has been configured with new IP=${IPADDR}"
|
||||
eval $(/usr/local/bin/readhash /var/ipfire/dns/settings)
|
||||
|
||||
create_dhcpcd_info()
|
||||
{
|
||||
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
|
||||
|
||||
#Check if we have to restart the services at update
|
||||
[ ! -e "/var/ipfire/red/active" ] update=1;
|
||||
if [ "$old_domain_name_service" != "$new_domain_name_service" ]; then
|
||||
update=1;
|
||||
fi
|
||||
if [ "$old_ip_address" != "$new_ip_address" ]; then
|
||||
update=1;
|
||||
fi
|
||||
if [ "$old_routers" != "$new_routers" ]; then
|
||||
update=1;
|
||||
fi
|
||||
|
||||
#Get DNS from dhcp
|
||||
if [ -n "$DNS0" ] && [ -n "$DNS1" ]; then
|
||||
logger -p local0.info -t dhcpcd.exe[$$] "Overwritting DNS-Server addresses with ${DNS0},${DNS1}"
|
||||
echo -n ${DNS0} > /var/ipfire/red/dns1
|
||||
echo -n ${DNS1} > /var/ipfire/red/dns2
|
||||
else
|
||||
echo -n `/etc/rc.d/helper/getdnsfromdhcpc.pl 1` > /var/ipfire/red/dns1
|
||||
echo -n `/etc/rc.d/helper/getdnsfromdhcpc.pl 2` > /var/ipfire/red/dns2
|
||||
fi
|
||||
|
||||
#Get IP Address
|
||||
echo "$new_ip_address" > /var/ipfire/red/local-ipaddress
|
||||
|
||||
#Get default gateway
|
||||
grep -v " gateway$" /etc/hosts > /tmp/hosts
|
||||
echo "$new_routers gateway" >> /tmp/hosts
|
||||
mv /tmp/hosts /etc/hosts
|
||||
|
||||
fi
|
||||
if [ $update ]; then
|
||||
[ -e "/var/ipfire/red/active" ] || touch /var/ipfire/red/active
|
||||
run_subdir ${rc_base}/init.d/networking/red.down/
|
||||
echo "$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/
|
||||
;;
|
||||
down)
|
||||
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/
|
||||
;;
|
||||
esac
|
||||
touch /var/ipfire/red/active
|
||||
fi
|
||||
}
|
||||
|
||||
# End
|
||||
remove_dhcpcd_info()
|
||||
{
|
||||
rm -f /var/ipfire/dhcpc/dhcpcd-$interface.info
|
||||
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/
|
||||
}
|
||||
|
||||
case "$reason" in
|
||||
BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT|STATIC) create_dhcpcd_info;;
|
||||
PREINIT|EXPIRE|FAIL|IPV4LL|NAK|NOCARRIER|RELEASE|STOP) remove_dhcpcd_info;;
|
||||
esac
|
||||
|
||||
@@ -80,8 +80,8 @@ fi
|
||||
|
||||
PIDFILE="/var/run/dhcpcd-${DEVICE}.pid"
|
||||
LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.info"
|
||||
DHCP_START="-N -R -L /var/ipfire/dhcpc -c /var/ipfire/dhcpc/dhcpcd.exe "
|
||||
DHCP_STOP="-k -c /var/ipfire/dhcpc/dhcpcd.exe "
|
||||
DHCP_START=" "
|
||||
DHCP_STOP="-k "
|
||||
|
||||
case "${1}" in
|
||||
start)
|
||||
@@ -142,7 +142,7 @@ case "${1}" in
|
||||
if [ -e $LEASEINFO ]; then
|
||||
boot_mesg -n "Stopping dhcpcd on the ${DEVICE} interface..."
|
||||
. $LEASEINFO
|
||||
if [ "$LEASETIME" = "4294967295" ]; then
|
||||
if [ "$dhcp_lease_time" = "4294967295" ]; then
|
||||
# do nothing, just echo ok
|
||||
echo ""
|
||||
echo_ok
|
||||
@@ -167,7 +167,7 @@ case "${1}" in
|
||||
fi
|
||||
fi
|
||||
|
||||
boot_mesg -n "Starting dhcpcd on the ${DEVICE} interface..."
|
||||
boot_mesg -n "Starting dhcpcd on the ${DEVICE} interface..."
|
||||
echo -n "${DEVICE}" > /var/ipfire/red/iface
|
||||
|
||||
## Create & Enable vnstat
|
||||
@@ -201,35 +201,18 @@ case "${1}" in
|
||||
echo_ok
|
||||
boot_mesg " DHCP Assigned Settings for ${DEVICE}:"
|
||||
boot_mesg_flush
|
||||
boot_mesg " IP Address: $IPADDR"
|
||||
boot_mesg " IP Address: $ip_address"
|
||||
boot_mesg_flush
|
||||
if [ -n "${RED_DHCP_HOSTNAME}" ]; then
|
||||
boot_mesg " Hostname: $RED_DHCP_HOSTNAME"
|
||||
boot_mesg_flush
|
||||
fi
|
||||
boot_mesg " Subnet Mask: $NETMASK"
|
||||
boot_mesg " Subnet Mask: $subnet_mask"
|
||||
boot_mesg_flush
|
||||
boot_mesg " Default Gateway: $GATEWAY"
|
||||
boot_mesg " Default Gateway: $routers"
|
||||
boot_mesg_flush
|
||||
boot_mesg " DNS Server: $DNS"
|
||||
boot_mesg " DNS Server: $domain_name_servers"
|
||||
boot_mesg_flush
|
||||
if [ -n "$DNS0" ] && [ -n "$DNS1" ]; then
|
||||
boot_mesg "Overwritting DNS-Server addresses with ${DNS0},${DNS1}"
|
||||
echo -n ${DNS0} > /var/ipfire/red/dns1
|
||||
echo -n ${DNS1} > /var/ipfire/red/dns2
|
||||
evaluate_retval
|
||||
else
|
||||
echo -n `/etc/rc.d/helper/getdnsfromdhcpc.pl 1` > /var/ipfire/red/dns1
|
||||
echo -n `/etc/rc.d/helper/getdnsfromdhcpc.pl 2` > /var/ipfire/red/dns2
|
||||
fi
|
||||
|
||||
. /var/ipfire/dhcpc/dhcpcd-${DEVICE}.info
|
||||
echo "$IPADDR" > /var/ipfire/red/local-ipaddress
|
||||
grep -v "gateway" /etc/hosts > /tmp/hosts
|
||||
echo "$GATEWAY gateway" >> /tmp/hosts
|
||||
mv /tmp/hosts /etc/hosts
|
||||
echo "$GATEWAY" > /var/ipfire/red/remote-ipaddress
|
||||
touch /var/ipfire/red/active
|
||||
else
|
||||
echo ""
|
||||
$(exit "$RET")
|
||||
@@ -266,7 +249,7 @@ 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"
|
||||
DHCP_START="-N -R -L /var/ipfire/dhcpc "
|
||||
DHCP_START=" "
|
||||
DHCP_STOP="-k "
|
||||
# Test to see if there is a stale pid file
|
||||
if [ -f "$PIDFILE" ]; then
|
||||
@@ -294,15 +277,15 @@ case "${1}" in
|
||||
echo_ok
|
||||
boot_mesg " DHCP Assigned Settings for ${DEVICE}.${RED_VDSL_IPTV_VLAN}:"
|
||||
boot_mesg_flush
|
||||
boot_mesg " IP Address: $IPADDR"
|
||||
boot_mesg " IP Address: $ip_address"
|
||||
boot_mesg_flush
|
||||
boot_mesg " Hostname: $RED_DHCP_HOSTNAME"
|
||||
boot_mesg_flush
|
||||
boot_mesg " Subnet Mask: $NETMASK"
|
||||
boot_mesg " Subnet Mask: $subnet_mask"
|
||||
boot_mesg_flush
|
||||
boot_mesg " Default Gateway: $GATEWAY"
|
||||
boot_mesg " Default Gateway: $routers"
|
||||
boot_mesg_flush
|
||||
boot_mesg " DNS Server: $DNS"
|
||||
boot_mesg " DNS Server: $domain_name_servers"
|
||||
boot_mesg_flush
|
||||
|
||||
else
|
||||
@@ -543,7 +526,7 @@ case "${1}" in
|
||||
if [ -e $LEASEINFO ]; then
|
||||
boot_mesg -n "Stopping dhcpcd on the ${DEVICE} interface..."
|
||||
. $LEASEINFO
|
||||
if [ "$LEASETIME" = "4294967295" ]; then
|
||||
if [ "$dchp_lease_time" = "4294967295" ]; then
|
||||
# do nothing, just echo ok
|
||||
echo ""
|
||||
echo_ok
|
||||
|
||||
Reference in New Issue
Block a user