vagrant-persistent-storage 0.0.48 → 0.0.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b2fdbe71f4317552272c4a3763d1e8bd5f98dd38bd54c28eea188dc3cfa6eb5
-  data.tar.gz: 6e8b86f309aa085be92810b37e85d3578480935a34d8c843d396fdd8fd085cd1
+  metadata.gz: 6c747645f753d9dcc3692e127df6c78c5b05cfc037853adcb39bf45d3c6d0376
+  data.tar.gz: df800f9b0f6c6a16fd8be1838a3c767e350af8c83f7744570b4177baa413836d
 SHA512:
-  metadata.gz: 4bf0725cb73422ac9fdbd0042b2b6898c75e41d7aaa2bae9831f40d10a14cf778664fb2e32c7765b1965f1961a24d7e306effa9503fd9d8711fe2369e47cbf11
-  data.tar.gz: 569058fb3a18680ab9bf6d7573a0b768c94c278abc101d149e81c164ae9b244338e8231a9abf936367e39dd0bd8e276308e838883e9932520c29e38972fae7f9
+  metadata.gz: 2e1324f22d8ba5bbf67c30ae7b526fd7602db17bf2abed14443f82087739d2715802eb86593a9a07b0d267c794d4fa99cd764f4eede20340451a7f9165f525da
+  data.tar.gz: 1679290b6c4993d87df4064f41908032d5bf8da4a0d10a3545293cdd1231398b41e950015ba71d318831fa6838894b715d9d28d9c70339d75b088675fb16e65d

data/README.md

@@ -2,7 +2,7 @@
 
 A Vagrant plugin that creates a persistent storage and attaches it to guest machine.
 
-Requires Virtualbox 5
+Requires Virtualbox 5/6
 
 ## Installation
 
@@ -24,7 +24,7 @@ config.persistent_storage.mountpoint = '/var/lib/mysql'
 config.persistent_storage.volgroupname = 'myvolgroup'
 ```
 
-With `config.persistent_storage.mountoptions` you can change the mount options (default: defaults).  
+With `config.persistent_storage.mountoptions` you can change the mount options (default: defaults).
 An example which sets `prjquota` option with xfs.
 ```ruby
 config.persistent_storage.mountname    = 'xfs'
@@ -48,17 +48,26 @@ When you expect a lot of writes in the disk (the case for `/home` mountpoints) i
 config.persistent_storage.variant    = 'Fixed'
 ```
 
+If you want to pass a list of options to the underlying `VboxManage
+storageattach` call, you can use the `config.persistent_storage.attachoptions`
+option. For instance, if you want to enable TRIM support:
+
+```ruby
+config.persistent_storage.mountoptions = ['defaults', 'discard']
+config.persistent_storage.attachoptions = ['--discard', 'on']
+```
+
 Every `vagrant up` will attach this file as hard disk to the guest machine.
 A `vagrant destroy` will detach the storage to avoid deletion of the storage by vagrant.
 A `vagrant destroy` generally destroys all attached drives. See [VBoxManage unregistervm --delete option][vboxmanage_delete].
 
-The disk is initialized and added to it's own volume group as specfied in the config; 
+The disk is initialized and added to it's own volume group as specfied in the config;
 this defaults to 'vagrant'. An ext4 filesystem is created and the disk mounted appropriately,
 with entries added to fstab ... subsequent runs will mount this disk with the options specified.
 
 ## Windows Guests
 
-Windows Guests must use the WinRM communicator by setting `vm.communicator = 'winrm'`.  An additional option is provided to 
+Windows Guests must use the WinRM communicator by setting `vm.communicator = 'winrm'`.  An additional option is provided to
 allow you to set the drive letter using:
 
 ```ruby
@@ -115,6 +124,7 @@ If your box is not using LVM you must set `config.persistent_storage.use_lvm = f
 * [Francesco](https://github.com/cisco87)
 * [Dimitris Aragiorgis](https://github.com/dimara)
 * [Symaxion](https://github.com/Symaxion)
+* [Alex Pyrgiotis](https://github.com/apyrgio)
 
 ## TODO
 

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

@@ -24,7 +24,8 @@ module VagrantPlugins
 
           env[:ui].info I18n.t("vagrant_persistent_storage.action.attach_storage")
           location = env[:machine].config.persistent_storage.location
-          env[:machine].provider.driver.attach_storage(location)
+          attachoptions = env[:machine].config.persistent_storage.attachoptions
+          env[:machine].provider.driver.attach_storage(location, attachoptions)
 
           @app.call(env)
 

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

@@ -17,6 +17,7 @@ module VagrantPlugins
       attr_accessor :mountname
       attr_accessor :mountpoint
       attr_accessor :mountoptions
+      attr_accessor :attachoptions
       attr_accessor :partition
       attr_accessor :diskdevice
       attr_accessor :filesystem
@@ -46,6 +47,7 @@ module VagrantPlugins
         @mountname = UNSET_VALUE
         @mountpoint = UNSET_VALUE
         @mountoptions = UNSET_VALUE
+        @attachoptions = UNSET_VALUE
         @diskdevice = UNSET_VALUE
         @filesystem = UNSET_VALUE
         @volgroupname = UNSET_VALUE
@@ -68,6 +70,7 @@ module VagrantPlugins
         @mountname = "" if @mountname == UNSET_VALUE
         @mountpoint = "" if @mountpoint == UNSET_VALUE
         @mountoptions = [] if @mountoptions == UNSET_VALUE
+        @attachoptions = [] if @attachoptions == UNSET_VALUE
         @diskdevice = "" if @diskdevice == UNSET_VALUE
         @filesystem = "" if @filesystem == UNSET_VALUE
         @volgroupname = "" if @volgroupname == UNSET_VALUE

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

@@ -15,7 +15,7 @@ module VagrantPlugins
             execute("storagectl", @uuid, "--name", controller_name, "--" + (self.remove_prefix(@version) ? "" : "sata") + "portcount", "2")
           end
         end
-        
+
         def remove_prefix(vbox_version)
            return vbox_version.start_with?("4.3") || vbox_version.start_with?("5.") || vbox_version.start_with?("6.")
         end
@@ -24,7 +24,7 @@ module VagrantPlugins
           execute("createhd", "--filename", File.expand_path(location), "--size", "#{size}", "--variant", "#{variant}")
         end
 
-        def attach_storage(location)
+        def attach_storage(location, attachoptions)
           controller_name = get_controller_name
           if controller_name.nil?
             controller_name = "SATA Controller"
@@ -32,15 +32,15 @@ module VagrantPlugins
 
           location_realpath = File.expand_path(location)
 
+          base_cmd = ["storageattach", @uuid, "--storagectl", get_controller_name, "--type", "hdd", "--medium", "#{location_realpath}"]
           if controller_name.start_with?("IDE")
-              execute("storageattach", @uuid, "--storagectl", get_controller_name, "--port", "1", "--device", "0", "--type", "hdd", "--medium", "#{location_realpath}")
+              ctrl_args = ["--port", "1", "--device", "0"]
           elsif controller_name.start_with?("SCSI")
-              execute("storageattach", @uuid, "--storagectl", get_controller_name, "--port", "15", "--device", "0", "--type", "hdd", "--medium", "#{location_realpath}")
+              ctrl_args = ["--port", "15", "--device", "0"]
           else
-              execute("storageattach", @uuid, "--storagectl", get_controller_name, "--port", "4", "--device", "0", "--type", "hdd", "--medium", "#{location_realpath}", "--hotpluggable", "on")
+              ctrl_args = ["--port", "4", "--device", "0", "--hotpluggable", "on"]
           end
-
-
+          execute(*(base_cmd + ctrl_args + attachoptions))
         end
 
         def detach_storage(location)
@@ -122,4 +122,3 @@ module VagrantPlugins
     end
   end
 end
-

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module PersistentStorage
-    VERSION = "0.0.48"
+    VERSION = "0.0.49"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-persistent-storage
 version: !ruby/object:Gem::Version
-  version: 0.0.48
+  version: 0.0.49
 platform: ruby
 authors:
 - Sebastian Kusnier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake