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

fix subroutine moving issue in xCAT-server/lib/xcat/plugins/

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13504 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
zhaoertao
2012-08-14 11:55:48 +00:00
parent 14afeedb9e
commit 3eda693ede
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-server/lib/xcat/plugins/activedirectory.pm
View File

@@ -46,7 +46,7 @@ sub process_request {
#my $server = $sitetab->getAttribs({key=>'directoryserver'},['value']);
#my $realm = $sitetab->getAttribs({key=>'realm'},['value']);
my @directoryservers = xCAT::TableUtils->get_site_attribute("directoryserver");
my @realms = xCAT::Utils->get_site_attribute("realm");
my @realms = xCAT::TableUtils->get_site_attribute("realm");
my $tmp1 = $realms[0];
my $server;
my $realm;

4
xCAT-server/lib/xcat/plugins/lsslp.pm
View File

@@ -853,7 +853,7 @@ sub get_host_from_url {
for my $net ( keys %$nets) {
my ($n,$m) = split /\//,$net;
if ( #xCAT::NetworkUtils::isInSameSubnet($n, $tip, $m, 1) and
xCAT::Utils::isPingable($tip) and (length(inet_aton($tip)) == 4)) {
xCAT::NetworkUtils::isPingable($tip) and (length(inet_aton($tip)) == 4)) {
push @validip, $tip;
}
}
@@ -1668,7 +1668,7 @@ sub filtersamevlan {
my $ip = ${$oldhash->{$name}}{ip};
for my $net ( keys %$validnets){
my ($n,$m) = split /\//,$net;
if ( xCAT::Utils::isInSameSubnet( $n, $ip, $m, 1)) {#and xCAT::Utils::isPingable( $ip)) {
if ( xCAT::NetworkUtils::isInSameSubnet( $n, $ip, $m, 1)) {#and xCAT::NetworkUtils::isPingable( $ip)) {
$newhash->{$name} = $oldhash->{$name};
}
}

2
xCAT-server/lib/xcat/plugins/mknb.pm
View File

@@ -142,7 +142,7 @@ sub process_request {
}
system ("rm -rf $tempdir");
my $hexnets = xCAT::NetworkUtils->my_hexnets();
my $normnets = xCAT::Utils->my_nets();
my $normnets = xCAT::NetworkUtils->my_nets();
my $consolecmdline;
if (defined($serialport) and $serialspeed) {
$consolecmdline = "console=tty0 console=ttyS$serialport,$serialspeed";