Merge branch 'master' into bash-completion-overhaul

bin/xen-delete-image

@@ -172,6 +172,7 @@ my %CONFIG;
 my $RELEASE = '4.2rc1';
 
 
+
 #
 # Read the global configuration file if it exists.
 #
@@ -219,21 +220,7 @@ while ( my $name = shift )
 {
     if ( !xenRunning($name) )
     {
-	#
-	#  Partition layout information values read from the
-	# partitions file, or constructed automatically if no
-	# partitions file is specified.
-	#
-
-	my @PARTITIONS = undef;
-
-	#
-	#  Check for partitions to delete by reading the DomU's
-	# configuration file
-	#
-	my @PARTITIONS = findPartitions($host
-
-        deleteXenImage($name, @PARTITIONS);
+        deleteXenImage($name);
     }
     else
     {
@@ -462,70 +449,6 @@ sub xenRunning
 }
 
 
-
-=begin doc
-
-  Read the (usually to be deleted) DomU configuration file specified
-  and returns the list of used partitions found in the file.
-
-=end doc
-
-=cut
-
-sub findPartitions
-{
-    my ($hostname) = (@_);
-    my $file = "/etc/xen/$hostname.cfg";
-
-    if ( -e $file )
-    {
-	open( FILE, "<", $file ) or die "Cannot read file '$file' - $!";
-
-	my $line = "";
-	my $contents = "";
-
-	while ( defined( $line = <FILE> ) )
-	{
-	    chomp $line;
-	    if ( $line =~ s/\\$// )
-	    {
-		$line .= <FILE>;
-		redo unless eof(FILE);
-	    }
-
-	    # Skip lines beginning with comments
-	    next if ( $line =~ /^([ \t]*)\#/ );
-
-	    # Skip blank lines
-	    next if ( length($line) < 1 );
-
-	    # Strip trailing comments.
-	    if ( $line =~ /(.*)\#(.*)/ )
-	    {
-		$line = $1;
-	    }
-
-	    $contents .= $line;
-	}
-
-	close(FILE);
-
-	if ($contents =~ /\ndisk\s*=\s*\[\s*(.*?)\s*\]\s*\n/) {
-	    my $disks = $1;
-	    my @disks = split(/\n/, $disks);
-	    foreach (@disks) {
-		s/^\s*'phy:(.*),\w*,\w*',\s*$/$1/;
-	    }
-	    return @disks;
-	}
-    } else {
-	warn "Couldn't find $file. May start guessing based on further parameters.\n";
-	return qw(GUESSING);
-    }
-}
-
-
-
 =begin doc
 
   Delete the named image, and the corresponding configuration file
@@ -537,11 +460,7 @@ sub findPartitions
 
 sub deleteXenImage
 {
-    my $hostname = shift;
-    my @partitions = @_;
-    my $guessing = ($#partitions == 0 and $partitions[0] eq 'GUESSING');
-
-
+    my ($hostname) = (@_);
 
     #
     #  Collect the names of files to delete.

misc/xen-tools

@@ -47,7 +47,7 @@ function _find_xen_images
 #
 _xen_create_image()
 {
-    local cur prev ip roles partitions dists vgs
+    local cur prev ip evmscontainers roles partitions dists vgs
 
     COMPREPLY=()
     cur=${COMP_WORDS[COMP_CWORD]}
@@ -158,7 +158,7 @@ complete -F _xen_create_image xen-create-image
 #
 _xen_create_nfs()
 {
-    local cur prev ip roles dists vgs
+    local cur prev
 
     COMPREPLY=()
     cur=${COMP_WORDS[COMP_CWORD]}
@@ -208,6 +208,7 @@ _xen_delete_image()
     # Complete the options + all available hostnames.
     # Determine arguments dynamically.  Avoids out-of-dateness.
     #
+    names=`_find_xen_images`
     opts=$(xen-delete-image  --help|grep -- --|awk '{print $1}'|grep -- -- | sort -u)
     opts="${opts} ${names}"
 
@@ -221,7 +222,6 @@ _xen_delete_image()
 	    return 0
 	    ;;
         --hostname)
-            names=`_find_xen_images`
             COMPREPLY=( $(compgen -W "${names}" -- ${cur}) )
 	    return 0
             ;;
@@ -251,7 +251,7 @@ complete -F _xen_delete_image xen-delete-image
 #
 _xen_update_image() 
 {
-    local cur prev opts base names vgs
+    local cur prev opts evmscontainers names vgs
     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
@@ -303,7 +303,7 @@ complete -F _xen_update_image xen-update-image
 #
 _xen_list_images() 
 {
-    local cur prev opts vgs
+    local cur prev opts
     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
@@ -325,7 +325,7 @@ complete -F _xen_list_images xen-list-images
 #
 _xt-create-xen-config()
 {
-    local cur prev
+    local cur prev opts
 
     COMPREPLY=()
     cur=${COMP_WORDS[COMP_CWORD]}
@@ -360,7 +360,7 @@ complete -F _xt-create-xen-config xt-create-xen-config
 #
 _xt-customize-image()
 {
-    local cur prev dists
+    local cur prev dists opts
 
     COMPREPLY=()
     cur=${COMP_WORDS[COMP_CWORD]}
@@ -401,7 +401,7 @@ complete -F _xt-customize-image xt-customize-image
 #
 _xt-install-image()
 {
-    local cur prev dists
+    local cur prev dists opts
 
     COMPREPLY=()
     cur=${COMP_WORDS[COMP_CWORD]}