vagrant-persistent-storage 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 779835b503c60cfda4e5a2e43a951c9a5b6e3752
-  data.tar.gz: ba2113df5cd9a1a1543efcf0591345c6bc9dbfa6
+  metadata.gz: d06ebc8e252aece51a84e0d8caec5691ecbed911
+  data.tar.gz: 4a5a9a4961fbd7a12221554a8739946addff1593
 SHA512:
-  metadata.gz: bf4d081fb06ffad08e1e17ca120e01e58ad9119bf3c03241280e19ed0c4f0d7ae0ab49a3e821414f8cde7a19c2bcb37454292e5b77b9ca6255986dbda31a6fb5
-  data.tar.gz: 5fb29450883b10cf242910d8e0e4f0d9fa8e20806f7bfe26d5e28570da1a013e3da3d422e8740a54eb1bfacc39849c70e332344e5a35016af29aea94dfb73082
+  metadata.gz: 355de3c1853498483c3897a4ecb79cb5aa98323f0b8f2c65a6bd11cc9faa7c0f8d95cbd386286934fe5558f09907d776c4211503d888d7e05b16534f0a6e7894
+  data.tar.gz: 019cc98b6f1d00e35543e5a817a4517faad61b976951f6be2b4cc5db5b8b514429a29fb031e74ae63ccbc4824c48e6d8cef912c63d52c929363ed6b8e79ec90e

data/README.md

@@ -40,6 +40,7 @@ with entries added to fstab ... subsequent runs will mount this disk with the op
 ## Contributors
 
 * [madAndroid](https://github.com/madAndroid)
+* [Jeremiah Snapp](https://github.com/jeremiahsnapp)
 
 ## TODO
 

data/lib/vagrant-persistent-storage/action/create_adapter.rb

@@ -18,8 +18,8 @@ module VagrantPlugins
           return @app.call(env) if @machine.state.id != :running && [:destroy, :halt, :suspend].include?(env[:machine_action])
           # skip if machine is not saved and the action is resume
           return @app.call(env) if @machine.state.id != :saved && env[:machine_action] == :resume
-          # skip if machine is powered off and the action is resume
-          return @app.call(env) if @machine.state.id == :poweroff && env[:machine_action] == :resume
+          # skip if machine is powered off and the action is resume or up
+          return @app.call(env) if @machine.state.id == :poweroff && [:resume, :up].include?(env[:machine_action])
           # skip if machine is saved
           return @app.call(env) if @machine.state.id == :saved
 

data/lib/vagrant-persistent-storage/providers/virtualbox/driver/base.rb

@@ -6,7 +6,13 @@ module VagrantPlugins
       class Base
 
         def create_adapter
-          execute("storagectl", @uuid, "--name", "SATA Controller", "--" + (@version.start_with?("4.3") ? "" : "sata") + "portcount", "2")
+          sata_controller_name = get_sata_controller_name
+          if sata_controller_name.nil?
+            sata_controller_name = "SATA Controller"
+            execute("storagectl", @uuid, "--name", sata_controller_name, "--" + (@version.start_with?("4.3") ? "" : "sata") + "portcount", "2", "--add", "sata")
+          else
+            execute("storagectl", @uuid, "--name", sata_controller_name, "--" + (@version.start_with?("4.3") ? "" : "sata") + "portcount", "2")
+          end
         end
 
         def create_storage(location, size)
@@ -14,12 +20,12 @@ module VagrantPlugins
         end
 
         def attach_storage(location)
-          execute("storageattach", @uuid, "--storagectl", "SATA Controller", "--port", "1", "--device", "0", "--type", "hdd", "--medium", "#{location}")
+          execute("storageattach", @uuid, "--storagectl", get_sata_controller_name, "--port", "1", "--device", "0", "--type", "hdd", "--medium", "#{location}")
         end
 
         def detach_storage(location)
           if location and identical_files(read_persistent_storage(location), location)
-            execute("storageattach", @uuid, "--storagectl", "SATA Controller", "--port", "1", "--device", "0", "--type", "hdd", "--medium", "none")
+            execute("storageattach", @uuid, "--storagectl", get_sata_controller_name, "--port", "1", "--device", "0", "--type", "hdd", "--medium", "none")
           end
         end
 
@@ -28,7 +34,7 @@ module VagrantPlugins
           sleep 3
           info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
           info.split("\n").each do |line|
-            return $1.to_s if line =~ /^"SATA Controller-1-0"="(.+?)"$/
+            return $1.to_s if line =~ /^"#{get_sata_controller_name}-1-0"="(.+?)"$/
           end
           nil
         end
@@ -37,6 +43,17 @@ module VagrantPlugins
           return File.identical?(Pathname.new(file1).realpath, Pathname.new(file2).realpath)
         end
 
+        def get_sata_controller_name
+          controllers = Hash.new
+          info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
+          info.split("\n").each do |line|
+            controllers[$1] = $2 if line =~ /^storagecontrollername(\d+)="(.*)"/
+            sata_controller_number = $1 if line =~ /^storagecontrollertype(\d+)="IntelAhci"/
+            return controllers[sata_controller_number] unless controllers[sata_controller_number].nil?
+          end
+          return nil
+        end
+
       end
     end
   end

data/lib/vagrant-persistent-storage/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module PersistentStorage
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-persistent-storage
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Sebastian Kusnier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake