vagrant-persistent-storage 0.0.16 → 0.0.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f1753a327642759189697913b1a53f035d39cec9
4
- data.tar.gz: dc5f41fd225674a0e8b676fe57f60f21eabb0dc0
3
+ metadata.gz: 62a64c3efa205a042b6e7ed82bbc9c61a2b8a7c7
4
+ data.tar.gz: 90636f95b9fb203afde4b874a756c4cb28da70f1
5
5
  SHA512:
6
- metadata.gz: ae461e26b183879b7c37289494c56f6b065346a3698da310ed3de76b767d4015328a16fa14378639978c3bb1c2ac72fb4ce556513d69a13d0ebeb6d0d31d3e48
7
- data.tar.gz: a1b126e45bbd13065ce7779c1e70923ad1edaf5808d0d05db14f988fd0c724e663856f91512b641ff5ecc7bd3c9fb2da2f9353bff1aac01cab648ce8ecda6788
6
+ metadata.gz: d8aa8d558879989c18701bc56b33db03303e2c857d97ad3babbd398aae230acdad6864395711e5b19737bdc8ddcc18886e4fe0ac47ceb48764a07725877654d5
7
+ data.tar.gz: e16bd8c1b74d949b262a845cc77b836f4712b79dbdd55d077dd8711b152dd1a768f7e8ad4aa05db2c24e971fcc0c6766e07898669d6010b14656a433564610fe
data/README.md CHANGED
@@ -71,6 +71,8 @@ If your box are not using LVM you must set `config.persistent_storage.use_lvm =
71
71
  * [aishahalim](https://github.com/aishahalim)
72
72
  * [Dick Tang](https://github.com/dictcp)
73
73
  * [dsmaher](https://github.com/dsmaher)
74
+ * [Marsup](https://github.com/Marsup)
75
+ * [k2s](https://github.com/k2s)
74
76
 
75
77
  ## TODO
76
78
 
@@ -58,7 +58,12 @@ module VagrantPlugins
58
58
  disk_operations_template = ERB.new <<-EOF
59
59
  #!/bin/bash
60
60
  # fdisk the disk if it's not a block device already:
61
- [ -b #{disk_dev}1 ] || echo 0,,8e | sfdisk #{disk_dev}
61
+ [[ $("sfdisk" --version) =~ ([0-9][.][0-9.]*[.][0-9.]*) ]] && version="${BASH_REMATCH[1]}"
62
+ if ! awk -v ver="$version" 'BEGIN { if (ver < 2.26 ) exit 1; }'; then
63
+ [ -b #{disk_dev}1 ] || echo 0,,8e | sfdisk #{disk_dev}
64
+ else
65
+ [ -b #{disk_dev}1 ] || echo ,,8e | sfdisk #{disk_dev}
66
+ fi
62
67
  echo "fdisk returned: $?" >> disk_operation_log.txt
63
68
 
64
69
  <% if use_lvm == true %>
@@ -9,9 +9,9 @@ module VagrantPlugins
9
9
  controller_name = get_controller_name
10
10
  if controller_name.nil?
11
11
  controller_name = "SATA Controller"
12
- execute("storagectl", @uuid, "--name", controller_name, "--" + (@version.start_with?("4.3") ? "" : "sata") + "portcount", "2", "--add", "sata")
12
+ execute("storagectl", @uuid, "--name", controller_name, "--" + ((@version.start_with?("4.3") || @version.start_with?("5.")) ? "" : "sata") + "portcount", "2", "--add", "sata")
13
13
  else
14
- execute("storagectl", @uuid, "--name", controller_name, "--" + (@version.start_with?("4.3") ? "" : "sata") + "portcount", "2")
14
+ execute("storagectl", @uuid, "--name", controller_name, "--" + ((@version.start_with?("4.3") || @version.start_with?("5.")) ? "" : "sata") + "portcount", "2")
15
15
  end
16
16
  end
17
17
 
@@ -1,5 +1,5 @@
1
1
  module VagrantPlugins
2
2
  module PersistentStorage
3
- VERSION = "0.0.16"
3
+ VERSION = "0.0.17"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-persistent-storage
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.16
4
+ version: 0.0.17
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sebastian Kusnier
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-06-11 00:00:00.000000000 Z
11
+ date: 2015-07-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake