Mal die von Maniac geloeschten Aenderungen wieder in die status.cgi gepackt.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@468 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/html/cgi-bin/status.cgi b/html/cgi-bin/status.cgi
index a0acdda1009b6d1de06da76b7fcdc11f0ddef990..4aa226334d0b1b9305061ee895c3325a624d25ef 100644 (file)
--- a/html/cgi-bin/status.cgi
+++ b/html/cgi-bin/status.cgi
@@ -276,7 +276,7 @@ print "</table>\n";
 &Header::closebox();
 
 &Header::openbox('100%', 'left', $Lang::tr{'interfaces'});
 &Header::closebox();
 
 &Header::openbox('100%', 'left', $Lang::tr{'interfaces'});

-$output = `/sbin/ifconfig`;
+$output = `/sbin/ip link show`;

 $output = &Header::cleanhtml($output,"y");
 
 my @itfs = ('ORANGE','BLUE','GREEN');
 $output = &Header::cleanhtml($output,"y");
 
 my @itfs = ('ORANGE','BLUE','GREEN');


@@ -303,7 +303,6 @@ print "<pre>$output</pre>\n";
 
 if ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/  && $netsettings{'RED_TYPE'} eq "DHCP") {
 
 
 if ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/  && $netsettings{'RED_TYPE'} eq "DHCP") {
 

-       print "<a name='reddhcp'/>\n";

        &Header::openbox('100%', 'left', "RED $Lang::tr{'dhcp configuration'}");
        if (-s "${General::swroot}/dhcpc/dhcpcd-$netsettings{'RED_DEV'}.info") {
 
        &Header::openbox('100%', 'left', "RED $Lang::tr{'dhcp configuration'}");
        if (-s "${General::swroot}/dhcpc/dhcpcd-$netsettings{'RED_DEV'}.info") {
 


@@ -381,20 +380,18 @@ END
 }
 
 if ($dhcpsettings{'ENABLE_GREEN'} eq 'on' || $dhcpsettings{'ENABLE_BLUE'} eq 'on') {
 }
 
 if ($dhcpsettings{'ENABLE_GREEN'} eq 'on' || $dhcpsettings{'ENABLE_BLUE'} eq 'on') {

-
-       print "<a name='leases'/>";

        &Header::CheckSortOrder;
        &Header::PrintActualLeases;
 }
 
 &Header::openbox('100%', 'left', $Lang::tr{'routing table entries'});
        &Header::CheckSortOrder;
        &Header::PrintActualLeases;
 }
 
 &Header::openbox('100%', 'left', $Lang::tr{'routing table entries'});

-$output = `/sbin/route -n`;
+$output = `/sbin/ip route show`;

 $output = &Header::cleanhtml($output,"y");
 print "<pre>$output</pre>\n";
 &Header::closebox();
 
 &Header::openbox('100%', 'left', $Lang::tr{'arp table entries'});
 $output = &Header::cleanhtml($output,"y");
 print "<pre>$output</pre>\n";
 &Header::closebox();
 
 &Header::openbox('100%', 'left', $Lang::tr{'arp table entries'});

-$output = `/sbin/arp -n`;
+$output = `/sbin/ip neigh show`;

 $output = &Header::cleanhtml($output,"y");
 print "<pre>$output</pre>\n";
 &Header::closebox();
 $output = &Header::cleanhtml($output,"y");
 print "<pre>$output</pre>\n";
 &Header::closebox();