ec2_amitools 1.0.2 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61e05c7c7f9a080bb9b10d5a15e481da80ae6aa0
-  data.tar.gz: d4285e6efa71a9cd56e7f7952594c249ae178384
+  metadata.gz: bdbbdd2100494c900e371771e6bd226f1435686a
+  data.tar.gz: 49211d86d6e301b0e9dc7f795532cb7250269ff7
 SHA512:
-  metadata.gz: 53819c3f2ab95eb3d778f8216b9411e48da84384947859058e77390af355ff8fca42ea8424d97cf4f68b07d981e4356333ce7084404a743b9d878374fb862c80
-  data.tar.gz: 6ebc9c3a6fa31f1654aae27a5321c2031451058585a0799303b5beba885d840206c2d1a30416cee6f6156d6b8616ef4223aea2e10ad714f746034eefca3c97fd
+  metadata.gz: d42b3b0df7fc5ce7ad45142ab600af33e6d2f1971596c8a64972c7e6cc1fea573488b719c6a1a92f8b56e740e04142e3b6902ef53d3b15b29af89d485dd170e2
+  data.tar.gz: 7238a1fd4ca54eb26398e2a7e939489b4685e561e2e9effac6008cf21104e0900bc3e211f789c185059e8b8719048bdca533c808a821ecb2941e16e70c4bc170

data/lib/ec2/platform/base/constants.rb

@@ -16,11 +16,13 @@ module EC2
     module Base
       module Constants
         module Bundling
-          EC2_HOME = ENV["EC2_AMITOOL_HOME"] || ENV["EC2_HOME"]
-          EC2_X509_CERT = File.join(EC2_HOME.to_s, '/etc/ec2/amitools/cert-ec2.pem')
-          EC2_X509_GOV_CERT = File.join(EC2_HOME.to_s, '/etc/ec2/amitools/cert-ec2-gov.pem')
-          EC2_X509_CN_NORTH_1_CERT = File.join(EC2_HOME.to_s, '/etc/ec2/amitools/cert-ec2-cn-north-1.pem')
-          EC2_MAPPING_FILE = File.join(EC2_HOME.to_s, '/etc/ec2/amitools/mappings.csv')
+          BASE_DIR = __FILE__.to_s.gsub(/\/lib\/.*/, '')
+
+          EC2_X509_CERT            = File.join(BASE_DIR, '/etc/ec2/amitools/cert-ec2.pem')
+          EC2_X509_GOV_CERT        = File.join(BASE_DIR, '/etc/ec2/amitools/cert-ec2-gov.pem')
+          EC2_X509_CN_NORTH_1_CERT = File.join(BASE_DIR, '/etc/ec2/amitools/cert-ec2-cn-north-1.pem')
+          EC2_MAPPING_FILE         = File.join(BASE_DIR, '/etc/ec2/amitools/mappings.csv')
+
           EC2_MAPPING_URL = 'https://ec2-downloads.s3.amazonaws.com/mappings.csv'
           DESTINATION = '/tmp'
         end

data/lib/ec2/platform/linux/image.rb

@@ -667,7 +667,7 @@ module EC2
           raise FatalError.new("image already mounted") if mounted?(IMG_MNT)
           dirs = ['mnt', 'proc', 'sys', 'dev']
           if self.is_disk_image?
-            execute( 'mount -t %s %s %s' % [@fstype, @target, IMG_MNT] )
+            execute( 'mount -o nouuid -t %s %s %s' % [@fstype, @target, IMG_MNT] )
             dirs.each{|dir| FileUtils.mkdir_p( '%s/%s' % [IMG_MNT, dir])}
             make_special_devices
             execute( 'mount -o bind /proc %s/proc' % IMG_MNT )

data/lib/ec2/version.rb

@@ -3,6 +3,6 @@ require 'ec2/amitools/version'
 module EC2
   module AMITools
     VERSION_TOOLS = "#{EC2Version::PKG_VERSION}.#{EC2Version::PKG_RELEASE}".freeze
-    VERSION = "1.0.2"
+    VERSION = "1.0.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ec2_amitools
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.6
 platform: ruby
 authors:
 - Alexey Bobyrev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-27 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: ec2_amitools provided by Amazon packed into a gem
+description: ec2-ami-tools-1.5.7 by Amazon packed into a gem
 email:
 - alexey.bobyrev@gmail.com
 executables:
@@ -80,7 +80,6 @@ files:
 - lib/ec2/amitools/bundlevolparameters.rb
 - lib/ec2/amitools/crypto.rb
 - lib/ec2/amitools/decryptmanifest.rb
-- lib/ec2/amitools/defaults.rb
 - lib/ec2/amitools/deletebundle.rb
 - lib/ec2/amitools/deletebundleparameters.rb
 - lib/ec2/amitools/downloadbundle.rb
@@ -180,5 +179,5 @@ rubyforge_project:
 rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
-summary: 'AWS: EC2 AMI Tools'
+summary: ec2-ami-tools-1.5.7
 test_files: []

data/lib/ec2/amitools/defaults.rb

@@ -1,12 +0,0 @@
-# Copyright 2008-2014 Amazon.com, Inc. or its affiliates.  All Rights
-# Reserved.  Licensed under the Amazon Software License (the
-# "License").  You may not use this file except in compliance with the
-# License. A copy of the License is located at
-# http://aws.amazon.com/asl or in the "license" file accompanying this
-# file.  This file is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
-# the License for the specific language governing permissions and
-# limitations under the License.
-
-EC2_HOME = ENV['EC2_AMITOOL_HOME'] || ENV['EC2_HOME']
-EC2_X509_CERT = '#{EC2_HOME}/etc/ec2/amitools/cert-ec2.pem'