github.com/xen-tools.xen-tools
1
0
Fork 0
mirror of synced 2026-04-30 13:51:42 +00:00
Code Releases Activity

2006-08-19 07:54:39 by steve

Browse Source 
Don't complain if there is no LVM swap file.
  Delete logfile if present.
This commit is contained in:
steve
2006-08-19 07:54:39 +00:00
parent 60bb043282
commit 7924c1d00a
2 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
bin/xen-delete-image
View File

@@ -54,10 +54,10 @@ Specify the LVM volume group where images were previously saved.
=head1 DESCRIPTION =head1 DESCRIPTION
xen-delete-image is a simple script which allows you to delete xen-delete-image is a simple script which allows you to delete
Xen instances which have previously been created by B<xen-create-image>. Xen instances which have previously been created by xen-create-image.
You must be root to run this script as it removes the Xen configuration You must be root to run this script as it removes the Xen configuration
file from /etc/xen. file from /etc/xen and potentially removes LVM volumes.
(When invoked with the '--test' flag the script will continue running, (When invoked with the '--test' flag the script will continue running,
but will fail to remove anything which the user does not have permission but will fail to remove anything which the user does not have permission
@@ -88,6 +88,9 @@ Specify the LVM volume group where images were previously saved.
This will remove the volumes 'foo-disk', 'foo-swap', 'bar-disk', This will remove the volumes 'foo-disk', 'foo-swap', 'bar-disk',
and 'bar-swap'. and 'bar-swap'.
Note that if the images were created with "--noswap" then the swap
volumes will not be present, so will not need to be deleted.
The Xen configuration files will also be removed. The Xen configuration files will also be removed.
=cut =cut
@@ -99,7 +102,7 @@ Specify the LVM volume group where images were previously saved.
-- --
http://www.steve.org.uk/ http://www.steve.org.uk/
$Id: xen-delete-image,v 1.14 2006-08-16 09:42:44 steve Exp $ $Id: xen-delete-image,v 1.15 2006-08-19 07:54:39 steve Exp $
=cut =cut
@@ -266,9 +269,9 @@ sub readConfigurationFile
sub parseCommandLineArguments sub parseCommandLineArguments
{ {
my $HELP = 0; my $HELP = 0;
my $MANUAL = 0; my $MANUAL = 0;
my $VERSION = 0; my $VERSION = 0;
# Parse options. # Parse options.
# #
@@ -288,7 +291,7 @@ sub parseCommandLineArguments
if ( $VERSION ) if ( $VERSION )
{ {
my $REVISION = '$Revision: 1.14 $'; my $REVISION = '$Revision: 1.15 $';
if ( $REVISION =~ /1.([0-9.]+) / ) if ( $REVISION =~ /1.([0-9.]+) / )
{ {
@@ -358,11 +361,17 @@ sub deleteXenImage
my ($hostname) = ( @_ ); my ($hostname) = ( @_ );
# #
# Delete the configuration file. # Delete the Xen configuration file, and the installation logfile
# if it exists.
# #
if ( -e "/etc/xen/" . $hostname . ".cfg" ) foreach my $file ( "/etc/xen/$hostname.cfg",
"/var/log/xen-tools/$hostname.log" )
{ {
unlink( "/etc/xen/" . $hostname . ".cfg" ); if ( -e $file )
{
$CONFIG{'verbose'} && print "Removing $file\n";
unlink( $file );
}
} }
@@ -424,11 +433,19 @@ sub deleteXenImage
# #
# TODO: Check we're not mounted. # TODO: Check we're not mounted.
# #
my $swap = "lvremove /dev/$CONFIG{'lvm'}/$hostname-swap --force";
my $disk = "lvremove /dev/$CONFIG{'lvm'}/$hostname-disk --force";
runCommand( $swap ); if ( -e "/dev/$CONFIG{'lvm'}/$hostname-swap" )
runCommand( $disk ); {
$CONFIG{'verbose'} && print "Removing LVM swap volume\n";
runCommand( "lvremove /dev/$CONFIG{'lvm'}/$hostname-swap --force" );
}
if ( -e "/dev/$CONFIG{'lvm'}/$hostname-disk" )
{
$CONFIG{'verbose'} && print "Removing LVM disk volume\n";
runCommand( "lvremove /dev/$CONFIG{'lvm'}/$hostname-disk --force" );
}
} }
else else
{ {

3
debian/changelog vendored
View File

@@ -1,6 +1,9 @@
* New upstream release. * New upstream release.
- Don't setup ramdisk in xm.tmpl if one isn't being used. - Don't setup ramdisk in xm.tmpl if one isn't being used.
(Closes: #383703) (Closes: #383703)
- xen-delete-image will not complain if a swap volume doesn't exist.
It will also remove the new installation logfile.
(Closes: #383736)
xen-tools (2.3-1) unstable; urgency=high xen-tools (2.3-1) unstable; urgency=high