CloudyScripts 2.14.62 → 2.14.63

data/lib/scripts/ec2/copy_mswindows_ami.rb

@@ -42,8 +42,9 @@ class CopyMsWindowsAmi < Ec2Script
   end
 
   def check_input_parameters()
+    post_message("Checking parameters...")
     # MS Windows AMI, source and target region
-    if @input_params[:ami_id] == nil && !(@input_params[:ami_id] =~ /^ami-.*$/)
+    if @input_params[:ami_id] == nil || !(@input_params[:ami_id] =~ /^ami-.*$/)
       raise Exception.new("Invalid AMI ID specified: #{@input_params[:ami_id]}")
     end
     if @local_ec2_helper.ami_prop(@input_params[:ami_id], 'rootDeviceType') != "ebs"
@@ -73,7 +74,6 @@ class CopyMsWindowsAmi < Ec2Script
       @input_params[:source_security_group] = "default"
     end
     if !@local_ec2_helper.check_open_port(@input_params[:source_security_group], 22)
-      #raise Exception.new("Port 22 must be opened for security group '#{@input_params[:source_security_group]}' to connect via SSH in source region")
       post_message("'#{@input_params[:source_security_group]}' Security Group not opened port 22 for connect via SSH in source region")
       @input_params[:source_security_group] = nil
     else
@@ -83,12 +83,32 @@ class CopyMsWindowsAmi < Ec2Script
       @input_params[:target_security_group] = "default"
     end
     if !@remote_ec2_helper.check_open_port(@input_params[:target_security_group], 22)
-      #raise Exception.new("Port 22 must be opened for security group '#{@input_params[:target_security_group]}' to connect via SSH in target region")
       post_message("'#{@input_params[:target_security_group]}' Security Group not opened port 22 for connect via SSH in target region")
       @input_params[:target_security_group] = nil
     else
       post_message("'#{@input_params[:target_security_group]}' Security Group opened port 22 for connect via SSH in target region")
     end
+    # AWS KeyPair, source an dtarget
+    if @input_params[:source_key_name] == nil || @input_params[:source_key_name].empty?()
+      raise Exception.new("No Key Pair name specified for source region")
+    else
+      begin
+        @local_ec2_helper.check_keypair(@input_params[:source_key_name])
+      rescue Exception => e
+        post_message("'#{@input_params[:source_key_name]}' Key Pair not found in source region") 
+        raise Exception.new("Key Pair not found in source region: #{e.to_s}")
+      end
+    end
+    if @input_params[:target_key_name] == nil || @input_params[:target_key_name].empty?()
+      raise Exception.new("No Key Pair name specified for target region")
+    else
+      begin
+        @remote_ec2_helper.check_keypair(@input_params[:target_key_name])
+      rescue Exception => e
+        post_message("'#{@input_params[:target_key_name]}' Key Pair not found in target region") 
+        raise Exception.new("Key Pair not found in target region: #{e.to_s}")
+      end
+    end
     # Device to use for volume
     if @input_params[:root_device_name] == nil
       @input_params[:root_device_name] = "/dev/sda1"
@@ -109,9 +129,30 @@ class CopyMsWindowsAmi < Ec2Script
     if @input_params[:target_ssh_username] == nil
       @input_params[:target_ssh_username] = "root"
     end
+    if @input_params[:source_ssh_keydata] == nil
+      raise Exception.new("No Private Key for source region")
+    else
+      begin
+        check_ssh_key(@input_params[:source_ssh_keydata])
+      rescue Exception => e
+        post_message("not a Private Key: #{e.to_s}")
+        raise Exception.new("Invalid Private Key for source region: #{e.to_s}")
+      end
+    end
+    if @input_params[:target_ssh_keydata] == nil
+      raise Exception.new("No Private Key for target region")
+    else
+      begin
+        check_ssh_key(@input_params[:target_ssh_keydata])
+      rescue Exception => e
+        post_message("not a Private Key:: #{e.to_s}") 
+        raise Exception.new("Invalid Private Key for target region: #{e.to_s}")
+      end
+    end
     if @input_params[:fs_type] == nil
       @input_params[:fs_type] = "ext3"
     end
+    # AWS Name and Description
     if @input_params[:description] == nil || !check_aws_desc(@input_params[:description])
       @input_params[:description] = "Created by CloudyScripts - #{self.class.name}"
     end
@@ -237,7 +278,7 @@ class CopyMsWindowsAmi < Ec2Script
       @context[:source_volume_id] = create_volume_from_snapshot(@context[:snapshot_id],
         @context[:source_availability_zone])
       source_device = @context[:device_name]
-      attach_volume(@context[:source_volume_id], @context[:source_instance_id], source_device)
+      attach_volume(@context[:source_volume_id], @context[:source_instance_id], source_device, Ec2Script::CS_AWS_TIMEOUT)
       connect(@context[:source_dns_name], @context[:source_ssh_username], nil, @context[:source_ssh_keydata]) 
       # detect if there is a shift for device mapping (between AWS and the operating system of the system)
       root_device_name = get_root_device_name()
@@ -259,7 +300,7 @@ class CopyMsWindowsAmi < Ec2Script
       # Step2: create and attach a temp volume of the same size to dump and compress the entire drive
       @context[:source_temp_volume_id] = create_volume(@context[:source_availability_zone], @context[:volume_size])
       temp_device = @context[:temp_device_name] 
-      attach_volume(@context[:source_temp_volume_id], @context[:source_instance_id], temp_device)
+      attach_volume(@context[:source_temp_volume_id], @context[:source_instance_id], temp_device, Ec2Script::CS_AWS_TIMEOUT)
       aws_device_letter = temp_device.split('/')[2].gsub('sd', '').gsub('xvd', '').gsub(/[0-9]/, '')
       while !aws_letter.eql?(os_letter)
         aws_letter.succ!
@@ -328,7 +369,7 @@ class CopyMsWindowsAmi < Ec2Script
       # Step1: create and attach a temp volume for receiving archive of the drive
       @context[:target_temp_volume_id] = create_volume(@context[:target_availability_zone], @context[:volume_size])
       temp_device = @context[:temp_device_name] 
-      attach_volume(@context[:target_temp_volume_id], @context[:target_instance_id], temp_device)
+      attach_volume(@context[:target_temp_volume_id], @context[:target_instance_id], temp_device, Ec2Script::CS_AWS_TIMEOUT)
       connect(@context[:target_dns_name], @context[:target_ssh_username], nil, @context[:target_ssh_keydata]) 
       # detect if there is a shift for device mapping (between AWS and the operating system of the system)
       root_device_name = get_root_device_name()
@@ -353,7 +394,7 @@ class CopyMsWindowsAmi < Ec2Script
       # Step3: create and attach a volume for uncompressing and restoring the entire drive
       @context[:target_volume_id] = create_volume(@context[:target_availability_zone], @context[:volume_size])
       target_device = @context[:device_name]
-      attach_volume(@context[:target_volume_id], @context[:target_instance_id], target_device)
+      attach_volume(@context[:target_volume_id], @context[:target_instance_id], target_device, Ec2Script::CS_AWS_TIMEOUT)
       aws_device_letter = target_device.split('/')[2].gsub('sd', '').gsub('xvd', '').gsub(/[0-9]/, '')
       if !aws_letter.eql?(os_letter)
         post_message("Detected specific kernel with shift between AWS and Kernel OS for device naming")
@@ -470,7 +511,7 @@ class CopyMsWindowsAmi < Ec2Script
       stop_instance(@context[:helper_instance_id])
       root_volume_id = get_root_volume_id(@context[:helper_instance_id])
       detach_volume(root_volume_id, @context[:helper_instance_id])
-      attach_volume(@context[:target_volume_id], @context[:helper_instance_id], @context[:helper_root_device_name])
+      attach_volume(@context[:target_volume_id], @context[:helper_instance_id], @context[:helper_root_device_name], Ec2Script::CS_AWS_TIMEOUT)
       start_instance(@context[:helper_instance_id])
 
       #XXX: return running instance for now
@@ -505,34 +546,100 @@ class CopyMsWindowsAmi < Ec2Script
   class AmiRegisteredState < CopyMsWindowsAmiState
     def enter()
       post_message("Cleaning Source and Target Regions...")
+      error = []
       local_region()
-      connect(@context[:source_dns_name], @context[:source_ssh_username], nil, @context[:source_ssh_keydata])
-      mount_point = "/mnt/tmp_#{@context[:source_temp_volume_id]}"
-      unmount_fs(mount_point)
-      disconnect()
-      detach_volume(@context[:source_temp_volume_id], @context[:source_instance_id])
-      detach_volume(@context[:source_volume_id], @context[:source_instance_id])
-      shut_down_instance(@context[:source_instance_id])
-      delete_volume(@context[:source_temp_volume_id])
-      delete_volume(@context[:source_volume_id])
+      begin
+        connect(@context[:source_dns_name], @context[:source_ssh_username], nil, @context[:source_ssh_keydata])
+        mount_point = "/mnt/tmp_#{@context[:source_temp_volume_id]}"
+        unmount_fs(mount_point)
+        disconnect()
+      rescue Exception => e
+        error << e
+        post_message("Unable to umount temporary volume '/mnt/tmp_#{@context[:source_temp_volume_id]}' in source region: #{e.to_s}")
+      end
+      begin
+        detach_volume(@context[:source_temp_volume_id], @context[:source_instance_id])
+       rescue Exception => e
+        error << e
+        post_message("Unable to detach temporary volume '#{@context[:source_temp_volume_id]}' in source region: #{e.to_s}")
+      end
+      begin    
+        detach_volume(@context[:source_volume_id], @context[:source_instance_id])
+      rescue Exception => e
+        error << e
+        post_message("Unable to detach volume '#{@context[:source_volume_id]}' in source region: #{e.to_s}")
+      end
+      begin
+        shut_down_instance(@context[:source_instance_id])
+      rescue Exception => e
+        error << e
+        post_message("Unable to shutdown instance '#{@context[:source_instance_id]}' in source region: #{e.to_s}")
+      end
+      begin
+        delete_volume(@context[:source_temp_volume_id])
+      rescue Exception => e
+        error << e
+        post_message("Unable to delete volume '#{@context[:source_temp_volume_id]}' in source region: #{e.to_s}")
+      end
+      begin
+        delete_volume(@context[:source_volume_id])
+      rescue Exception => e
+        error << e
+        post_message("Unable to delete volume '#{@context[:source_volume_id]}' in source region: #{e.to_s}")
+      end
+
       #XXX: delete Security Group according to its name
       if @context[:source_security_group].eql?(Ec2Script::CS_SEC_GRP_NAME)
-        delete_security_group(@context[:source_security_group])
+        begin
+          delete_security_group(@context[:source_security_group])
+        rescue Exception => e
+          error << e
+          post_message("Unable to delete Security Group '#{@context[:source_security_group]}' in source region: #{e.to_s}")
+        end
       end
 
       #
       remote_region()
-      connect(@context[:target_dns_name], @context[:target_ssh_username], nil, @context[:target_ssh_keydata])
-      mount_point = "/mnt/tmp_#{@context[:target_temp_volume_id]}"
-      unmount_fs(mount_point)
-      disconnect()
-      detach_volume(@context[:target_temp_volume_id], @context[:target_instance_id])
-      shut_down_instance(@context[:target_instance_id])
-      delete_volume(@context[:target_temp_volume_id])
+      begin
+        connect(@context[:target_dns_name], @context[:target_ssh_username], nil, @context[:target_ssh_keydata])
+        mount_point = "/mnt/tmp_#{@context[:target_temp_volume_id]}"
+        unmount_fs(mount_point)
+        disconnect()
+      rescue Exception => e
+        error << e
+        post_message("Unable to umount temporary volume '/mnt/tmp_#{@context[:target_temp_volume_id]}' in target region: #{e.to_s}")
+      end
+      begin
+        detach_volume(@context[:target_temp_volume_id], @context[:target_instance_id])
+       rescue Exception => e
+        error << e
+        post_message("Unable to detach temporary volume '#{@context[:target_temp_volume_id]}' in target region: #{e.to_s}")
+      end
+      begin
+        shut_down_instance(@context[:target_instance_id])
+      rescue Exception => e
+        error << e
+        post_message("Unable to shutdown instance '#{@context[:target_instance_id]}' in target region: #{e.to_s}")
+      end
+      begin
+        delete_volume(@context[:target_temp_volume_id])
+      rescue Exception => e
+        error << e
+        post_message("Unable to delete temporary volume '#{@context[:target_temp_volume_id]}' in target region: #{e.to_s}")
+      end
       #delete_volume(@context[:target_volume_id])
       #XXX: delete Security Group according to its name
       if @context[:target_security_group].eql?(Ec2Script::CS_SEC_GRP_NAME)
-        delete_security_group(@context[:target_security_group])
+        begin
+          delete_security_group(@context[:target_security_group])
+        rescue Exception => e
+          error << e
+          post_message("Unable to delete Security Group '#{@context[:target_security_group]}' in target region: #{e.to_s}")
+        end
+      end
+
+      if error.size() > 0
+        raise Exception.new("Cleanup error(s)")
       end
  
       Done.new(@context)

data/lib/scripts/ec2/copy_mswindows_snapshot.rb

@@ -71,6 +71,17 @@ class CopyMsWindowsSnapshot < Ec2Script
     else
       post_message("'#{@input_params[:target_security_group]}' Security Group opened port 22 for connect via SSH in target region")
     end
+    # AWS KeyPair, source an dtarget
+    if @input_params[:source_key_name] == nil || @input_params[:source_key_name].empty?()
+      raise Exception.new("No KeyPair name specified for source region")
+    else
+      @local_ec2_helper.check_keypair(@input_params[:source_key_name])
+    end
+    if @input_params[:target_key_name] == nil || @input_params[:target_key_name].empty?()
+      raise Exception.new("No KeyPair name specified for target region")
+    else
+      @remote_ec2_helper.check_keypair(@input_params[:target_key_name])
+    end
     # Device to use for volume
     if @input_params[:root_device_name] == nil
       @input_params[:root_device_name] = "/dev/sda1"
@@ -91,9 +102,22 @@ class CopyMsWindowsSnapshot < Ec2Script
     if @input_params[:target_ssh_username] == nil
       @input_params[:target_ssh_username] = "root"
     end
+    if @input_params[:source_ssh_keydata] == nil
+      raise Exception.new("No Private Key for source region")
+    else
+      post_message("Checking SSH key for source region...")
+      check_ssh_key(@input_params[:source_ssh_keydata])
+    end
+    if @input_params[:target_ssh_keydata] == nil
+      raise Exception.new("No Private Key for target region")
+    else
+      post_message("Checking SSH key for target region...")
+      check_ssh_key(@input_params[:target_ssh_keydata])
+    end
     if @input_params[:fs_type] == nil
       @input_params[:fs_type] = "ext3"
     end
+    # AWS Name and Description
     if @input_params[:description] == nil || !check_aws_desc(@input_params[:description])
       @input_params[:description] = "Created by CloudyScripts - #{self.class.name}"
     end
@@ -186,7 +210,7 @@ class CopyMsWindowsSnapshot < Ec2Script
       @context[:source_volume_id] = create_volume_from_snapshot(@context[:snapshot_id],
         @context[:source_availability_zone])
       source_device = @context[:device_name]
-      attach_volume(@context[:source_volume_id], @context[:source_instance_id], source_device)
+      attach_volume(@context[:source_volume_id], @context[:source_instance_id], source_device, Ec2Script::CS_AWS_TIMEOUT)
       connect(@context[:source_dns_name], @context[:source_ssh_username], nil, @context[:source_ssh_keydata]) 
       # detect if there is a shift for device mapping (between AWS and the operating system of the system)
       root_device_name = get_root_device_name()
@@ -212,7 +236,7 @@ class CopyMsWindowsSnapshot < Ec2Script
         @context[:source_temp_volume_id] = create_volume(@context[:source_availability_zone], @context[:volume_size] + 4)
       end
       temp_device = @context[:temp_device_name] 
-      attach_volume(@context[:source_temp_volume_id], @context[:source_instance_id], temp_device)
+      attach_volume(@context[:source_temp_volume_id], @context[:source_instance_id], temp_device, Ec2Script::CS_AWS_TIMEOUT)
       aws_device_letter = temp_device.split('/')[2].gsub('sd', '').gsub('xvd', '').gsub(/[0-9]/, '')
       while !aws_letter.eql?(os_letter)
         aws_letter.succ!
@@ -291,7 +315,7 @@ class CopyMsWindowsSnapshot < Ec2Script
         @context[:target_temp_volume_id] = create_volume(@context[:target_availability_zone], @context[:volume_size] + 4)
       end
       temp_device = @context[:temp_device_name] 
-      attach_volume(@context[:target_temp_volume_id], @context[:target_instance_id], temp_device)
+      attach_volume(@context[:target_temp_volume_id], @context[:target_instance_id], temp_device, Ec2Script::CS_AWS_TIMEOUT)
       connect(@context[:target_dns_name], @context[:target_ssh_username], nil, @context[:target_ssh_keydata]) 
       # detect if there is a shift for device mapping (between AWS and the operating system of the system)
       root_device_name = get_root_device_name()
@@ -316,7 +340,7 @@ class CopyMsWindowsSnapshot < Ec2Script
       # Step3: create and attach a volume for uncompressing and restoring the entire drive
       @context[:target_volume_id] = create_volume(@context[:target_availability_zone], @context[:volume_size])
       target_device = @context[:device_name]
-      attach_volume(@context[:target_volume_id], @context[:target_instance_id], target_device)
+      attach_volume(@context[:target_volume_id], @context[:target_instance_id], target_device, Ec2Script::CS_AWS_TIMEOUT)
       aws_device_letter = target_device.split('/')[2].gsub('sd', '').gsub('xvd', '').gsub(/[0-9]/, '')
       if !aws_letter.eql?(os_letter)
         post_message("Detected specific kernel with shift between AWS and Kernel OS for device naming")

data/lib/scripts/ec2/copy_snapshot.rb

@@ -38,6 +38,17 @@ class CopySnapshot< Ec2Script
 
   def check_input_parameters()
     local_ec2_helper = Ec2Helper.new(@input_params[:ec2_api_handler])
+    remote_ec2_helper = Ec2Helper.new(@input_params[:target_ec2_handler])
+    if @input_params[:source_key_name] == nil || @input_params[:source_key_name].empty?()
+      raise Exception.new("No KeyPair name specified for source region")
+    else
+      local_ec2_helper.check_keypair(@input_params[:source_key_name])
+    end
+    if @input_params[:target_key_name] == nil || @input_params[:target_key_name].empty?()
+      raise Exception.new("No KeyPair name specified for target region")
+    else
+      remote_ec2_helper.check_keypair(@input_params[:target_key_name])
+    end
     if @input_params[:source_security_group] == nil
       @input_params[:source_security_group] = "default"
     end
@@ -47,8 +58,7 @@ class CopySnapshot< Ec2Script
     else
       post_message("'#{@input_params[:source_security_group]}' Security Group opened port 22 for connect via SSH in source region")
     end
-    remote_ec2_helper = Ec2Helper.new(@input_params[:target_ec2_handler])
-    if @input_params[:target_security_group] == nil
+      if @input_params[:target_security_group] == nil
       @input_params[:target_security_group] = "default"
     end
     if !remote_ec2_helper.check_open_port(@input_params[:target_security_group], 22)
@@ -63,6 +73,18 @@ class CopySnapshot< Ec2Script
     if @input_params[:target_ssh_username] == nil
       @input_params[:target_ssh_username] = "root"
     end
+    if @input_params[:source_ssh_keydata] == nil
+      raise Exception.new("No Private Key for source region")
+    else
+      post_message("Checking SSH key for source region...")
+      check_ssh_key(@input_params[:source_ssh_keydata])
+    end
+    if @input_params[:target_ssh_keydata] == nil
+      raise Exception.new("No Private Key for target region")
+    else
+      post_message("Checking SSH key for target region...")
+      check_ssh_key(@input_params[:target_ssh_keydata])
+    end
     if @input_params[:description] == nil || !check_aws_desc(@input_params[:description])
       @input_params[:description] = "Created by CloudyScripts - #{self.class.name}" 
     end
@@ -123,7 +145,7 @@ class CopySnapshot< Ec2Script
         @context[:source_availability_zone])
       device = "/dev/sdj"  #TODO: make device configurable
       mount_point = "/mnt/tmp_#{@context[:source_volume_id]}"
-      attach_volume(@context[:source_volume_id], @context[:source_instance_id], device)
+      attach_volume(@context[:source_volume_id], @context[:source_instance_id], device, Ec2Script::CS_AWS_TIMEOUT)
       connect(@context[:source_dns_name], @context[:source_ssh_username], nil, @context[:source_ssh_keydata])
       mount_fs(mount_point, device)
       # get partition label and filesystem type
@@ -168,7 +190,7 @@ class CopySnapshot< Ec2Script
       @context[:target_volume_id] = create_volume(@context[:target_availability_zone], volume_size)
       device = "/dev/sdj"  #TODO: make device configurable
       mount_point = "/mnt/tmp_#{@context[:target_volume_id]}"
-      attach_volume(@context[:target_volume_id], @context[:target_instance_id], device)
+      attach_volume(@context[:target_volume_id], @context[:target_instance_id], device, Ec2Script::CS_AWS_TIMEOUT)
       connect(@context[:target_dns_name], @context[:target_ssh_username], nil, @context[:target_ssh_keydata])
       create_labeled_fs(@context[:target_dns_name], device, @context[:fs_type], @context[:label])
       mount_fs(mount_point, device)

data/lib/scripts/ec2/download_snapshot.rb

@@ -4,6 +4,7 @@ require "help/remote_command_handler"
 require "help/dm_crypt_helper"
 require "help/ec2_helper"
 require "AWS"
+require "help/helper"
 
 # Script to download a specific snapshot as ZIP
 # * create a specific instance (with Apache Server),
@@ -34,6 +35,7 @@ class DownloadSnapshot < Ec2Script
   end
 
   def check_input_parameters()
+    post_message("Checking parameters...")
     if @input_params[:security_group_name] == nil
       @input_params[:security_group_name] = "default"
     end
@@ -41,16 +43,27 @@ class DownloadSnapshot < Ec2Script
     if @input_params[:security_group_name] == nil
       @input_params[:security_group_name] = "default"
     end
+    # AWS Security Group
     if !ec2_helper.check_open_port(@input_params[:security_group_name], 22)
-      #raise Exception.new("Port 22 must be opened for security group #{@input_params[:security_group_name]} to connect via SSH")
       post_message("'#{@input_params[:security_group_name]}' Security Group not opened port 22 for connect via SSH")
       @input_params[:security_group_name] = nil
     end
-    if !ec2_helper.check_open_port(@input_params[:security_group_name], 80)
-      #raise Exception.new("Port 80 must be opened for security group #{@input_params[:security_group_name]} to make the download link work")
+    if @input_params[:security_group_name] != nil && !ec2_helper.check_open_port(@input_params[:security_group_name], 80)
       post_message("'#{@input_params[:security_group_name]}' Security Group not opened port 80 for download via HTTP")
       @input_params[:security_group_name] = nil
     end
+    # AWS KeyPair
+    if @input_params[:key_name] == nil || @input_params[:key_name].empty?()
+      raise Exception.new("No KeyPair name specified")
+    else
+      begin
+        ec2_helper.check_keypair(@input_params[:key_name])
+      rescue Exception => e
+        post_message("'#{@input_params[:key_name]}' Key pair not found") 
+        raise Exception.new("#{e.to_s}")
+      end
+    end
+    # Device, Directory and file name
     if @input_params[:source_device] == nil
       @input_params[:source_device] = "/dev/sdj"
     end
@@ -66,9 +79,16 @@ class DownloadSnapshot < Ec2Script
     if @input_params[:wait_time] == nil
       @input_params[:wait_time] = 300
     end
+    # SSH Parameters
     if @input_params[:ssh_username] == nil
       @input_params[:ssh_username] = "root"
     end
+    if @input_params[:ssh_keydata] == nil
+      raise Exception.new("No Private Key for source region")
+    else
+      post_message("Checking SSH key for source region...")
+      check_ssh_key(@input_params[:ssh_keydata])
+    end
   end
 
   # Load the initial state for the script.
@@ -126,8 +146,8 @@ class DownloadSnapshot < Ec2Script
   class VolumesCreated < DownloadSnapshotState
     def enter
       @context[:script].post_message("Going to create two volumes. One with the snapshot data, one to store the zipped data for download.")
-      attach_volume(@context[:source_volume_id], @context[:instance_id], @context[:source_device])
-      attach_volume(@context[:dest_volume_id], @context[:instance_id], @context[:dest_device])
+      attach_volume(@context[:source_volume_id], @context[:instance_id], @context[:source_device], Ec2Script::CS_AWS_TIMEOUT)
+      attach_volume(@context[:dest_volume_id], @context[:instance_id], @context[:dest_device], Ec2Script::CS_AWS_TIMEOUT)
 
       VolumesAttached.new(@context)
     end
@@ -149,11 +169,12 @@ class DownloadSnapshot < Ec2Script
         @context[:script].post_message("Using '#{@context[:source_device]}' as source filesystem")
       end
       mount_fs(source_dir, @context[:source_device])
-      @context[:fs_type], @context[:label] = get_partition_fs_type_and_label(source_dir)
+      #XXX: filesystem type and device label do not matter as we are creating an archive of the filesystem
+      #@context[:fs_type], @context[:label] = get_partition_fs_type_and_label(source_dir)
       # target
       dest_dir = @context[:zip_file_dest]
-      #create_fs(@context[:dns_name], @context[:dest_device])
-      create_labeled_fs(@context[:dns_name], @context[:dest_device], @context[:fs_type], @context[:label])
+      create_fs(@context[:dns_name], @context[:dest_device])
+      #create_labeled_fs(@context[:dns_name], @context[:dest_device], @context[:fs_type], @context[:label])
       mount_fs(dest_dir, @context[:dest_device])
 
       FileSystemsReady.new(@context)