diff --git a/html/cgi-bin/netexternal.cgi b/html/cgi-bin/netexternal.cgi
index fba57605b..332774c21 100644
--- a/html/cgi-bin/netexternal.cgi
+++ b/html/cgi-bin/netexternal.cgi
@@ -83,13 +83,13 @@ if ( $querry[0] ne~ ""){
&General::readhash("${General::swroot}/dhcpc/dhcpcd-$netsettings{'RED_DEV'}.info", \%dhcpinfo);
- my $DNS1=`echo $dhcpinfo{'DNS'} | cut -f 1 -d ,`;
- my $DNS2=`echo $dhcpinfo{'DNS'} | cut -f 2 -d ,`;
+ my $DNS1=`echo $dhcpinfo{'domain_name_servers'} | cut -f 1 -d ,`;
+ my $DNS2=`echo $dhcpinfo{'domain_name_servers'} | cut -f 2 -d ,`;
my $lsetme=0;
my $leasetime="";
- if ($dhcpinfo{'LEASETIME'} ne "") {
- $lsetme=$dhcpinfo{'LEASETIME'};
+ if ($dhcpinfo{'dhcp_lease_time'} ne "") {
+ $lsetme=$dhcpinfo{'dhcp_lease_time'};
$lsetme=($lsetme/60);
if ($lsetme > 59) {
@@ -106,8 +106,8 @@ if ( $querry[0] ne~ ""){
my $rentme=0;
my $rnwltime="";
- if ($dhcpinfo{'RENEWALTIME'} ne "") {
- $rentme=$dhcpinfo{'RENEWALTIME'};
+ if ($dhcpinfo{'dhcp_renewal_time'} ne "") {
+ $rentme=$dhcpinfo{'dhcp_renewal_time'};
$rentme=($rentme/60);
if ($rentme > 59){
@@ -124,8 +124,8 @@ if ( $querry[0] ne~ ""){
my $maxtme=0;
my $maxtime="";
- if ($dhcpinfo{'REBINDTIME'} ne "") {
- $maxtme=$dhcpinfo{'REBINDTIME'};
+ if ($dhcpinfo{'dhcp_rebinding_time'} ne "") {
+ $maxtme=$dhcpinfo{'dhcp_rebinding_time'};
$maxtme=($maxtme/60);
if ($maxtme > 59){
@@ -139,19 +139,14 @@ if ( $querry[0] ne~ ""){
}
}
- print "
";
-
- if ($dhcpinfo{'HOSTNAME'}) {
- print "| $Lang::tr{'hostname'} | $dhcpinfo{'HOSTNAME'}.$dhcpinfo{'DOMAIN'} |
\n";
- } else {
- print "| $Lang::tr{'domain'} | $dhcpinfo{'DOMAIN'} |
\n";
- }
print <$Lang::tr{'gateway'} | $dhcpinfo{'GATEWAY'} |
+
+| $Lang::tr{'domain'} | $dhcpinfo{'domain_name'} |
+| $Lang::tr{'gateway'} | $dhcpinfo{'routers'} |
| $Lang::tr{'primary dns'} | $DNS1 |
| $Lang::tr{'secondary dns'} | $DNS2 |
-| $Lang::tr{'dhcp server'} | $dhcpinfo{'DHCPSIADDR'} |
+| $Lang::tr{'dhcp server'} | $dhcpinfo{'dhcp_server_identifier'} |
| $Lang::tr{'def lease time'} | $leasetime |
| $Lang::tr{'default renewal time'} | $rnwltime |
| $Lang::tr{'max renewal time'} | $maxtime |
diff --git a/src/initscripts/init.d/networking/dhcpcd.exe b/src/initscripts/init.d/networking/dhcpcd.exe
index 6c0807f77..d0e6599c3 100644
--- a/src/initscripts/init.d/networking/dhcpcd.exe
+++ b/src/initscripts/init.d/networking/dhcpcd.exe
@@ -16,7 +16,7 @@
eval $(/usr/local/bin/readhash /var/ipfire/dns/settings)
-create_dhcpcd_info()
+dhcpcd_up()
{
set | grep "^new_" | sed "s|^new_||g" | \
sort > /var/ipfire/dhcpc/dhcpcd-$interface.info
@@ -64,15 +64,18 @@ create_dhcpcd_info()
fi
}
-remove_dhcpcd_info()
+dhcpcd_down()
{
- 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/
+ set | grep "^new_" | sed "s|^new_||g" | \
+ sort > /var/ipfire/dhcpc/dhcpcd-$interface.info
+ if [ "$interface" != "red0.8" ]; 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/
+ fi
}
case "$reason" in
-BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT|STATIC) create_dhcpcd_info;;
-PREINIT|EXPIRE|FAIL|IPV4LL|NAK|NOCARRIER|RELEASE|STOP) remove_dhcpcd_info;;
+BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT|STATIC) dhcpcd_up;;
+PREINIT|EXPIRE|FAIL|IPV4LL|NAK|NOCARRIER|RELEASE|STOP) dhcpcd_down;;
esac