fix for bug 3947: add check for AIX and nmap existence

This commit is contained in:
ligc 2014-01-08 23:29:30 +08:00
parent c1359797e8
commit f35332a0d1
2 changed files with 18 additions and 0 deletions

8
perl-xCAT/xCAT/SLP.pm Normal file → Executable file
View File

@ -99,6 +99,14 @@ sub dodiscover {
my $printinfo = join(",", @printip);
if ($unicast) {
if (xCAT::Utils->isAIX()){
send_message($args{reqcallback}, 1, "lsslp unicast is not supported on AIX");
exit 1;
}
if (! -f "/usr/bin/nmap"){
send_message($args{reqcallback}, 1, "nmap does not exist, lsslp unicast is not possible");
exit 1;
}
my @servernodes;
my @iprange = split /,/, $ipranges;
foreach my $range (@iprange) {

10
xCAT-client/pods/man1/lsslp.1.pod Normal file → Executable file
View File

@ -36,6 +36,14 @@ B<-h> Display usage message.
B<-n> Only display and write the newly discovered hardwares.
B<-u> Do unicast to a specified IP range. Must be used with -s and --range.
The -u flag is not supported on AIX.
B<--range> Specify one or more IP ranges. Must be use in unicast mode.
It accepts multiple formats. For example, 192.168.1.1/24, 40-41.1-2.3-4.1-100.
If the range is huge, for example, 192.168.1.1/8, lsslp may take a very long time for node scan.
So the range should be exactly specified.
B<-r> Display Raw SLP response.
B<-C> The number of the expected responses specified by the user.
@ -274,6 +282,8 @@ e114ngmm1:
otherinterfaces=70.0.0.30
hwtype=cmm
10. To use lsslp unicast, enter:
lsslp -u -s CEC --range 40-41.1-2.1-2.1-2
=head1 FILES