xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-30 19:02:27 +00:00
Code Issues Releases Wiki Activity

Correct mistaken checkin

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8329 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso
2010-12-06 16:42:01 +00:00
parent d80f159f4d
commit 7afadc07fc
3 changed files with 2 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
perl-xCAT/xCAT/Table.pm
View File

@@ -687,11 +687,11 @@ sub new
my $create = 1;
if (exists($otherargs{'-create'}) && ($otherargs{'-create'}==0)) {$create = 0;}
$self->{autocommit} = $otherargs{'-autocommit'};
$self->{realautocommit} = $self->{autocommit}; #Assume we let the DB do the work, i.e. the autocommit is either not used or is not emulated by Table.pm
unless (defined($self->{autocommit}))
{
$self->{autocommit} = 1;
}
$self->{realautocommit} = $self->{autocommit}; #Assume we let the DB do the work, i.e. the autocommit is either not used or is not emulated by Table.pm
my $class = ref($proto) || $proto;
if ($dbworkerpid) {
my $request = {

1
xCAT-server/lib/xcat/plugins/dhcp.pm
View File

@@ -42,7 +42,6 @@ my %dynamicranges; #track dynamic ranges defined to see if a host that resolves
# dhcp 4.x will use /etc/dhcp/dhcpd.conf as the config file
if ( $^O ne 'aix' and -d "/etc/dhcp" ) {
$dhcpconffile = '/etc/dhcp/dhcpd.conf';
$dhcp6conffile = '/etc/dhcp/dhcpd6.conf';
}
sub ipIsDynamic {

56
xCAT-server/lib/xcat/plugins/networks.pm
View File

@@ -348,7 +348,6 @@ sub donets
} else {
# For Linux systems
my @ip6table = split /\n/,`/sbin/ip -6 route`;
my @rtable = split /\n/, `/bin/netstat -rn`;
open($rconf, "/etc/resolv.conf");
my @nameservers;
@@ -383,60 +382,6 @@ sub donets
$netgw{$entarr[0]}{$entarr[2]} = $entarr[1];
}
}
#routers advertise their role completely outside of DHCPv6 scope, we don't need to
#get ipv6 routes and in fact *cannot* dictate router via DHCPv6 at this specific moment.
foreach (@ip6table)
{
my @ent = split /\s+/, $_;
if ($ent[0] eq 'fe80::/64' or $ent[0] eq 'unreachable' or $ent[1] eq 'via') {
#Do not contemplate link-local, unreachable, or gatewayed networks further
#DHCPv6 relay will be manually entered into networks as was the case for IPv4
next;
}
my $net = shift @ent;
my $dev = shift @ent;
if ($dev eq 'dev') {
$dev = shift @ent;
} else {
die "Unrecognized IPv6 routing entry $_";
}
my @myv6addrs=split /\n/,`ip -6 addr show dev $dev scope global`;
#for v6, deprecating mask since the CIDR slash syntax is ubiquitous
my $consideredaddr=$net;
$consideredaddr=~ s!/(.*)!!;
my $consideredbits=$1;
#below may be redundant, but apply resolution in case ambiguous net, e.g. 2001:0db8:0::/64 is the same thing as 2001:0db8::/64
$consideredaddr = xCAT::NetworkUtils::getipaddr($consideredaddr);
my $netexists=0;
foreach my $netn (@netlist) { #search for network that doesn't exist yet
my $curnet=$nethash{$netn}{'net'};
unless ($curnet =~ /:/) { #only ipv6 here
next;
}
$curnet =~ s!/(.*)!!; #remove
my $curnetbits=$1;
unless ($consideredbits==$curnetbits) { #only matches if netmask matches
next;
}
$currnet = xCAT::NetworkUtils::getipaddr($currnet);
unless ($currnet eq $consideredaddr) {
next;
}
$netexists=1;
}
if ($::DISPLAY) {
push @{$rsp->{data}}, "\n#From $host.";
push @{$rsp->{data}}, "$net:";
push @{$rsp->{data}}, " objtype=network";
push @{$rsp->{data}}, " net=$net";
push @{$rsp->{data}}, " mgtifname=$dev";
} else {
unless ($netexiss) {
$nettab->setAttribs({'net' => $net, 'mask' => ''}, {'netname' => $net, 'mgtifname' => $dev});
}
}
}
foreach (@rtable)
{ #should be the lines to think about, do something with U, and something else with UG
@@ -564,6 +509,7 @@ sub donets
}
}
}
#Nothing much sane to do for the other fields at the moment?
}
elsif ($ent[3] eq 'UG')