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

correct the usage of rmosdistro to " rmosdistro [-a|--all] [-f|--force] osdistroname [osdistroname2 ...] "

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14242 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
immarvin
2012-11-05 09:32:54 +00:00
parent cf9050c8b3
commit 400aec04d5
2 changed files with 48 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
xCAT-client/pods/man8/rmosdistro.8.pod
View File

@@ -5,7 +5,7 @@ B<rmosdistro> - remove OS Distro
=head1 SYNOPSIS
B<rmosdistro> [{B<-n|--name>}=I<osdistroname>] [B<-f|--force>]
B<rmosdistro> [B<-a>|B<--all>] [B<-f|--force>] B<osdistroname> [B<osdistroname2 ...>]
B<rmosdistro> [B<-h>|B<--help>]
@@ -13,16 +13,21 @@ B<rmosdistro> [B<-h>|B<--help>]
=head1 DESCRIPTION
The B<rmosdistro> command is an command to support PCM OS Distro management. It removes the specified OS Distro that was created by B<copycds>. If no osdistroname specified, all entries will be deleted. If the specified OS Distro is referenced by some osimage, B<[-f|force]> can be used to remove it.
The B<rmosdistro> command removes the specified OS Distro that was created by B<copycds>. To delete all OS Distro entries, please specify B<[-a|--all]>. If the specified OS Distro is referenced by some osimage, B<[-f|force]> can be used to remove it.
=head1 ARGUMENTS
The OS Distro names to delete, delimited by blank space.
=head1 OPTIONS
=over 6
=item {B<-n|--name>}=I<osdistroname>
=item {B<-a|--all>}
The OSDistro name to remove. If not specified, try to delete all the OS Distros.
If specified, try to delete all the OS Distros.
=item {B<-f|--force>}
@@ -49,9 +54,9 @@ Nonzero:
=item *
To remove OS Distro "rhels6.2-ppc64":
To remove OS Distro "rhels6.2-ppc64" and "sles11.2-ppc64":
B<rmosdistro rhels6.2-ppc64>
B<rmosdistro rhels6.2-ppc64 sles11.2-ppc64>
=item *
@@ -63,7 +68,7 @@ B<rmosdistro -f rhels6.2-ppc64>
To remove all OS Distros:
B<rmosdistro>
B<rmosdistro -a>
=back

67
xCAT-server/lib/xcat/plugins/osdistro.pm
View File

@@ -18,7 +18,7 @@ use xCAT::Utils;
use xCAT::MsgUtils;
use Getopt::Long;
use Data::Dumper;
#-------------------------------------------------------
@@ -136,8 +136,7 @@ sub rmosdistro
my $request = shift;
my $callback = shift;
my %keyhash=();
my $distname=undef;
my $all=undef;
my $force=undef;
my $help=undef;
@@ -148,22 +147,32 @@ sub rmosdistro
if ($request->{arg}) {
@ARGV = @{$request->{arg}};
}
GetOptions(
'h|help' => \$help,
'n|name=s' => \$distname,
'a|all' => \$all,
'f|force' => \$force,
);
if ($help) {
$callback->({info=>"rmosdistro [{-n|--name}=osdistroname] [-f|--force]",errorcode=>[0]});
$callback->({info=>"rmosdistro [{-a|--all}] [-f|--force] [osdistroname] ...",errorcode=>[0]});
return;
}
unless($all)
{
unless(scalar @ARGV)
{
$callback->({info=>"please specify osdistroname to remove, or specify \"-a|--all\" to remove all osdistros ",errorcode=>[1]});
return;
}
#if any osdistro has been specified,push it into array
push(@OSdistroListToDel,@ARGV);
}
my $osdistrotab = xCAT::Table->new('osdistro',-create=>1);
unless($osdistrotab)
{
$callback->({error=>"rmosdistro: failed to open table 'osdistro'!",errorcode=>[1]});
@@ -171,12 +180,8 @@ sub rmosdistro
}
#if any osdistro has been specified,push it into array;otherwise push all osdistronames
if($distname)
{
push(@OSdistroListToDel,$distname);
}
else
#if -a or --all is specified,push all the osdistronames to the array to delete
if($all)
{
my @result=$osdistrotab->getAllAttribs('osdistroname');
if(defined(@result) and scalar @result >0)
@@ -190,8 +195,7 @@ sub rmosdistro
if(scalar @OSdistroListToDel)
{
#if -f|--force is not specified,need to open osimage table to check the reference of osdistro
#if -f|--force is not specified,need to open osimage table to check the reference of osdistro
my $osimagetab=undef;
unless($force)
{
@@ -199,6 +203,7 @@ sub rmosdistro
unless($osimagetab)
{
$callback->({error=>"rmosdistro: failed to open table 'osimage'!",errorcode=>[1]});
$osdistrotab->close();
return;
}
}
@@ -206,7 +211,7 @@ sub rmosdistro
foreach(@OSdistroListToDel)
{
#if -f|--force not specified,check the reference of osdistro,complain if the osdistro is referenced by some osimage
#if -f|--force not specified,check the reference of osdistro,complain if the osdistro is referenced by some osimage
unless($force)
{
my $result=&getOSdistroref($osimagetab,$_);
@@ -217,8 +222,8 @@ sub rmosdistro
}
}
#get "dirpaths" attribute of osdistro to remove the directory, complain if failed to lookup the osdistroname
$keyhash{osdistroname} = $_;
#get "dirpaths" attribute of osdistro to remove the directory, complain if failed to lookup the osdistroname
my %keyhash=('osdistroname' => $_,);
my $result=$osdistrotab->getAttribs(\%keyhash,'dirpaths');
unless($result)
{
@@ -226,7 +231,7 @@ sub rmosdistro
next;
}
#remove the osdistro directories
#remove the osdistro directories
if($result->{'dirpaths'})
{
$result->{'dirpaths'} =~ s/,/\ /g;
@@ -237,20 +242,20 @@ sub rmosdistro
$callback->({error=>"rmosdistro: failed to remove $keyhash{osdistroname} directory!",errorcode=>[1]});
next;
}
}
}
#remove the osdistro entry
$osdistrotab->delEntries(\%keyhash);
$osdistrotab->commit;
$callback->({info=>"rmosdistro: remove $_ success",errorcode=>[0]});
#remove the osdistro entry
$osdistrotab->delEntries(\%keyhash);
$osdistrotab->commit;
$callback->({info=>"rmosdistro: remove $_ success",errorcode=>[0]});
}
}
if($osimagetab)
{
$osimagetab->close;
}
}
if($osimagetab)
{
$osimagetab->close;
}
}
$osdistrotab->close;