From 60e668a110e8ec589b0ed5bc1ad33e6e61cb54f1 Mon Sep 17 00:00:00 2001 From: Chuck Brazie Date: Mon, 14 Aug 2017 11:21:01 -0400 Subject: [PATCH] Update seqdiscovery.pm --- xCAT-server/lib/xcat/plugins/seqdiscovery.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/seqdiscovery.pm b/xCAT-server/lib/xcat/plugins/seqdiscovery.pm index a332158c2..fa040e570 100755 --- a/xCAT-server/lib/xcat/plugins/seqdiscovery.pm +++ b/xCAT-server/lib/xcat/plugins/seqdiscovery.pm @@ -882,21 +882,20 @@ Usage: # Check the running of sequential discovery @SEQDiscover = xCAT::TableUtils->get_site_attribute("__SEQDiscover"); @ZVMDiscover = xCAT::TableUtils->get_site_attribute("__ZVMDiscover"); + my @PCMDiscover = xCAT::TableUtils->get_site_attribute("__PCMDiscover"); if ($SEQDiscover[0]) { $type = "seq"; } elsif ($PCMDiscover[0]) { - - #return directly if profile discovery is running. + #return directly if profile discovery is running. return; } elsif ( $ZVMDiscover[0] ) { # zvmdiscovery handles requests for a running z/VM discovery. return; - } else { - - # no type, no seq and no profile, then just display all - $type = "all"; - } + } else { + # no type, no seq and no profile, then just display all + $type = "all"; } + } # If a zvmHost was specified then let zvmdiscovery handle it. # Specifying '-u' will keep processing within seqdiscovery. @@ -905,6 +904,7 @@ Usage: return; } + my $DBname = xCAT::Utils->get_DBName; # support for DB2 # Go through discoverydata table and display the discovery entries my $distab = xCAT::Table->new('discoverydata'); unless ($distab) {