No-address fixes

This commit is contained in:
Jamie Cameron
2011-06-28 12:28:23 -04:00
parent cb80f76b1b
commit 175a62d425
3 changed files with 5 additions and 3 deletions

View File

@@ -44,6 +44,7 @@ ifcs_range=Range $1
ifcs_static2=Static configuration
ifcs_static3=IPv6 enabled
ifcs_noaddress=No address configured
ifcs_nonetmask=None
ifcs_mode=IPv4 address
ifcs_mode6=IPv6 addresses
ifcs_address6=IPv6 address

View File

@@ -209,8 +209,9 @@ foreach $a (@boot) {
$a->{'dhcp'} ? $text{'ifcs_dhcp'} :
$a->{'address'} ? &html_escape($a->{'address'}) :
$text{'ifcs_noaddress'});
push(@cols, $a->{'netmask'} ? &html_escape($a->{'netmask'})
: $text{'ifcs_auto'});
push(@cols, $a->{'netmask'} ? &html_escape($a->{'netmask'}) :
!$a->{'address'} ? $text{'ifcs_nonetmask'} :
$text{'ifcs_auto'});
if (&supports_address6()) {
push(@cols, $a->{'auto6'} ? $text{'ifcs_auto6'} :
join("<br>\n", map { &html_escape($_) }

View File

@@ -117,7 +117,7 @@ while($f = readdir(CONF)) {
$b->{'address6'} = [ map { $_->[0] } @ip6s ];
$b->{'netmask6'} = [ map { $_->[1] } @ip6s ];
}
elsif ($conf{'IPV6INIT'}) {
elsif (lc($conf{'IPV6INIT'}) eq 'yes') {
$b->{'auto6'} = 1;
}
$b->{'edit'} = ($b->{'name'} !~ /^ppp|irlan/);