vagrant-persistent-storage 0.0.44 → 0.0.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c0c150ceb7eaff53a28ae1acf561970b5a35ec75
-  data.tar.gz: 111e5f2f5ef40a711a31f8d40d93d349d7eaa9c4
+SHA256:
+  metadata.gz: 6c747645f753d9dcc3692e127df6c78c5b05cfc037853adcb39bf45d3c6d0376
+  data.tar.gz: df800f9b0f6c6a16fd8be1838a3c767e350af8c83f7744570b4177baa413836d
 SHA512:
-  metadata.gz: 52fd811411ae2e8b0b23949c1f2b8ffe2c572ba7ab2575ffb3cb95d0f945250ac24eed14f3de5ea4d3c6c6b8806239f763eb99d2a1b109b1436aaa1e495a7ea1
-  data.tar.gz: eea95b5979d7a0f8453c985400b6de4a06dc7cc544476b5deb6d1f465fd17f142b33bf7354abfb31bcc8cb52376a4bd587009b6dd296f4ef689d59a7f68ffcf6
+  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
@@ -69,7 +78,7 @@ Options that are irrelevent to Windows are ignored, such as `mountname`, `filesy
 
 ## How Is The Storage Created?
 
-Based on the configuration provided, during a `vagrant up` a bash script is generated and uploaded to `/tmp/disk_operations_#{mnt_name}.sh` (Linux) or `disk_operations_#{mnt_name}.ps1` (Windows).  If the box has not been previously provisioned the script is executed on a `vagrant up`.  To force the script to be executed again you can run `vagrant provision` or if you have halted the box, `vagrant up --provision`.
+Based on the configuration provided, during a `vagrant up` a bash script is generated and uploaded to `$tmpdir/disk_operations_#{mnt_name}.sh` (Linux) or `disk_operations_#{mnt_name}.ps1` (Windows).  If the box has not been previously provisioned the script is executed on a `vagrant up`.  To force the script to be executed again you can run `vagrant provision` or if you have halted the box, `vagrant up --provision`.
 
 The outcome of the script being run is placed in the home drive of the vagrant user in a file called `disk_operation_log.txt`.
 
@@ -113,6 +122,9 @@ If your box is not using LVM you must set `config.persistent_storage.use_lvm = f
 * [Adam Huffman](https://github.com/verdurin)
 * [caio2k](https://github.com/caio2k)
 * [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

@@ -1,3 +1,4 @@
+require 'log4r'
 require 'pathname'
 
 module VagrantPlugins
@@ -16,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
@@ -45,11 +47,13 @@ module VagrantPlugins
         @mountname = UNSET_VALUE
         @mountpoint = UNSET_VALUE
         @mountoptions = UNSET_VALUE
+        @attachoptions = UNSET_VALUE
         @diskdevice = UNSET_VALUE
         @filesystem = UNSET_VALUE
         @volgroupname = UNSET_VALUE
         @drive_letter = UNSET_VALUE
         @part_type_code = UNSET_VALUE
+        @logger = Log4r::Logger.new('vagrant::persistent_storage::config')
       end
 
       def finalize!
@@ -66,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
@@ -150,6 +155,17 @@ module VagrantPlugins
           })
         end
 
+        if ! Pathname.new(machine.config.persistent_storage.location).absolute?
+          # Non-absolute paths are relative to machine's root directory (where
+          # Vagrantfile is placed). Paths under HOME, e.g., ~/disk.vdi), are
+          # expanded as expected.
+          new_location = File.expand_path(machine.config.persistent_storage.location, machine.env.root_path)
+          @logger.info "Found non-absolute location #{machine.config.persistent_storage.location}. Using location #{new_location} instead."
+          machine.config.persistent_storage.location = new_location
+        end
+
+        machine.ui.info "Using #{machine.config.persistent_storage.location} for persistent storage."
+
         if ! File.exists?@location.to_s and ! @create == "true"
           errors << I18n.t('vagrant_persistent_storage.config.no_create_and_missing', {
             :config_key => 'persistent_storage.create',

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

@@ -5,6 +5,12 @@ require 'erb'
 module VagrantPlugins
   module PersistentStorage
     module ManageStorage
+      def get_tmp_dir(m)
+        m.communicate.sudo('dirname $(mktemp -u)', :error_check => false) do |type, data|
+          tmpdir = data.to_s.strip
+		  return tmpdir
+        end
+      end
       def populate_template(m)
         mnt_name = m.config.persistent_storage.mountname
         mnt_point = m.config.persistent_storage.mountpoint
@@ -60,7 +66,7 @@ module VagrantPlugins
 		else
 		## shell script to format disk, create/manage LVM, mount disk
         disk_operations_template = ERB.new <<-EOF
-#!/bin/bash
+#!/usr/bin/env bash
 DISK_DEV=#{disk_dev}
 <% if partition == true %>
 # fdisk the disk if it's not a block device already:
@@ -115,7 +121,8 @@ exit $?
 		if os == 'windows'
 			target_script = "disk_operations_#{mnt_name}.ps1"
 		else
-			target_script = "/tmp/disk_operations_#{mnt_name}.sh"
+			tmpdir = get_tmp_dir(m)
+			target_script = tmpdir + "/disk_operations_#{mnt_name}.sh"
 		end
 
         File.open("#{tmp_script.path}", 'wb') do |f|
@@ -135,7 +142,8 @@ exit $?
 			target_script = "disk_operations_#{mnt_name}.ps1"
 			m.communicate.sudo("powershell -executionpolicy bypass -file #{target_script}")
 		else
-			target_script = "/tmp/disk_operations_#{mnt_name}.sh"
+			tmpdir = get_tmp_dir(m)
+			target_script = tmpdir + "/disk_operations_#{mnt_name}.sh"
 			m.communicate.sudo("#{target_script}")
 		end
 
@@ -147,7 +155,6 @@ exit $?
           run_disk_operations(m)
         end
       end
-
     end
   end
 end

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)
@@ -48,6 +48,7 @@ module VagrantPlugins
           persistent_storage_data = read_persistent_storage(location_realpath)
           if location and persistent_storage_data and identical_files(persistent_storage_data.location, location_realpath)
               execute("storageattach", @uuid, "--storagectl", persistent_storage_data.controller, "--port", persistent_storage_data.port, "--device", "0", "--type", "hdd", "--medium", "none")
+              execute("closemedium", "disk", persistent_storage_data.image)
           end
         end
 
@@ -57,13 +58,27 @@ module VagrantPlugins
           storage_data = nil
           controller_name = get_controller_name
           info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
+          # Parse the following two lines matching the controller name:
+          # "SATA Controller-4-0"="/data/my-persistent-disk.vdi"
+          # "SATA Controller-ImageUUID-4-0"="1b5c4a17-3f84-49ba-b394-bfc609f30283"
+          # The first reports the underlying file, while the second reports the
+          # UUID of the VirtualBox medium.
           info.split("\n").each do |line|
               tmp_storage_data = nil
-              tmp_storage_data = PersistentStorageData.new(controller_name, $1, $3) if line =~ /^"#{controller_name}-(\d+)-(\d+)"="(.*)"/
+              tmp_storage_data = PersistentStorageData.new(controller_name, $1, $3, nil) if line =~ /^"#{controller_name}-(\d+)-(\d+)"="(.*)"/
+
+              tmp_storage_data_image = nil
+              tmp_storage_data_image = $3 if line =~ /^"#{controller_name}-ImageUUID-(\d+)-(\d+)"="(.*)"/
 
               if !tmp_storage_data.nil? and tmp_storage_data.location != 'none' and identical_files(File.expand_path(location), tmp_storage_data.location)
                   storage_data = tmp_storage_data
               end
+
+              # XXX: The ImageUUID line comes second and thus we have already
+              # storage_data initialized.
+              if !storage_data.nil? and !tmp_storage_data_image.nil?
+                  storage_data.image = tmp_storage_data_image
+              end
           end
           return storage_data
         end
@@ -93,11 +108,13 @@ module VagrantPlugins
           attr_accessor :controller
           attr_accessor :port
           attr_accessor :location
+          attr_accessor :image
 
-          def initialize(controller,port,location)
+          def initialize(controller,port,location,image)
             @controller = controller
             @port = port
             @location = location
+            @image = image
           end
         end
 
@@ -105,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.44"
+    VERSION = "0.0.49"
   end
 end

data/test.sh

@@ -31,8 +31,8 @@ do
 	else
 		echo ...[FAILED]
 	fi
-	VAGRANT_VAGRANTFILE="$f" vagrant destroy -f --no-color >> $f.log && "$VBOXMANAGE" closemedium disk virtualdrive.vdi --delete >> $f.log 2>&1 
+	VAGRANT_VAGRANTFILE="$f" vagrant destroy -f --no-color >> $f.log && rm -fv virtualdrive.vdi >> $f.log 2>&1 
 done
 
 
-popd > /dev/null
+popd > /dev/null

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-persistent-storage
 version: !ruby/object:Gem::Version
-  version: 0.0.44
+  version: 0.0.49
 platform: ruby
 authors:
 - Sebastian Kusnier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -92,8 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Vagrant plugin that creates a persistent storage and attaches it to guest