vagrant-vmware-dhcp 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e79948a505c5fd7198d8a4e30c31a85acfceea88
-  data.tar.gz: 1e7815abe6fd14a1a535fe7d415cb341fc87592e
+  metadata.gz: 8d5f260c0846fb882557b8a0126d4bc905f93af9
+  data.tar.gz: a76636beea09d3be97f32cf5f23d1df7b520985d
 SHA512:
-  metadata.gz: 153746f190ba6ad0fb1a71e6310f230407f8fb82f48f66fa0e4ba0c1ad8555ec89025b34e46ecdc2992cb8dd91382723bb906a953898d61103c70a7ba8e9b654
-  data.tar.gz: 4e9b895b4eb3a02f56d0d7efd5f2f8ab5c45dc139c2b05fea877bc55171fdd41edf28d758db886d22bf86ecdae6a528d243b91368538c4f30bbb97f6f0dbdec9
+  metadata.gz: a0303e52af1f2727f7c050e84dad78c0360308ada672d15a99ea8b839540af466a52b39173c44324903860762f51b7f54129d369a4619a7484e7e5168cf2ffe8
+  data.tar.gz: 5153762c66271ffd56cdfa0ce238f688d8c4c2949a619883573283a33e7e5ced5e2c6d75eb03dbc3052d2bd6c1005563af74aee06103974996f985069c8bf382

data/lib/vagrant-vmware-dhcp/action/config_dhcp.rb

@@ -106,7 +106,9 @@ module VagrantPlugins
             @logger.info("Pruning DHCP configuration for #{network[:ip]}")
             prune_dhcpd_conf(network)
 
-            if machine.config.control_dhcp == true
+            @env[:ui].error("CONTROL_DHCP is #{machine.config.control_dhcp.enable}")
+
+            if machine.config.control_dhcp.enable
               @env[:ui].info("Configuring DHCP for #{network[:ip]} on #{network[:vnet]}")
 
               write_dhcpd_conf(network)

data/lib/vagrant-vmware-dhcp/action/config_dhcp_darwin.rb

@@ -24,6 +24,7 @@ module VagrantPlugins
           escaped_conf_location = Vagrant::Util::ShellQuote.escape(conf_location, "'")
 
           mac = network[:mac]
+          ip = network[:ip]
 
           before = File.open(conf_location).read
           @logger.debug("Before altering, dhcpd.conf content is #{before}")
@@ -40,6 +41,18 @@ module VagrantPlugins
 
           system(*command)
 
+          command = []
+          command << "sudo" if !File.writable?(conf_location)
+          command += [
+            "sed", "-E", "-e",
+            "/^# VAGRANT-BEGIN: #{ip}/," +
+            "/^# VAGRANT-END: #{ip}/ d",
+            "-ibak",
+            conf_location
+          ]
+
+          system(*command)
+
           after = File.open(conf_location).read
           @logger.debug("After, dhcpd.conf content is #{after}")
         end

data/lib/vagrant-vmware-dhcp/action/config_dhcp_linux.rb

@@ -24,6 +24,7 @@ module VagrantPlugins
           escaped_conf_location = Vagrant::Util::ShellQuote.escape(conf_location, "'")
 
           mac = network[:mac]
+          ip = network[:ip]
 
           before = File.open(conf_location).read
           @logger.debug("Before altering, dhcpd.conf content is #{before}")
@@ -40,6 +41,18 @@ module VagrantPlugins
 
           system(*command)
 
+          command = []
+          command << "sudo" if !File.writable?(conf_location)
+          command += [
+            "sed", "-E", "-e",
+            "/^# VAGRANT-BEGIN: #{ip}/," +
+            "/^# VAGRANT-END: #{ip}/ d",
+            "-ibak",
+            conf_location
+          ]
+
+          system(*command)
+
           after = File.open(conf_location).read
           @logger.debug("After, dhcpd.conf content is #{after}")
         end

data/lib/vagrant-vmware-dhcp/action/config_dhcp_windows.rb

@@ -27,11 +27,13 @@ module VagrantPlugins
           conf_location = dhcpd_conf_location(network)
 
           mac = network[:mac]
+          ip = network[:ip]
 
           before = File.open(conf_location).read
           @logger.debug("Before altering, dhcpd.conf content is #{before}")
 
-          after = before.gsub(/^# VAGRANT-BEGIN: #{mac}.*^# VAGRANT-END: #{mac}\s+/m, '')
+          intermediate = before.gsub(/^# VAGRANT-BEGIN: #{mac}.*^# VAGRANT-END: #{mac}\s+/m, '')
+          after = intermediate.gsub(/^# VAGRANT-BEGIN: #{ip}.*^# VAGRANT-END: #{ip}\s+/m, '')
 
           File.open(conf_location, "w") { |fd| fd.write(after) }
 

data/lib/vagrant-vmware-dhcp/config.rb

@@ -11,7 +11,7 @@ module VagrantPlugins
 
       def finalize!
         if @enable != true
-          @enable = false 
+          @enable = false
         end
       end
     end

data/lib/vagrant-vmware-dhcp/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VagrantVmwareDhcp
-    VERSION = '0.0.7'
+    VERSION = '0.0.8'
   end
 end

data/templates/dhcpd_static.erb

@@ -1,4 +1,4 @@
-# VAGRANT-BEGIN: <%= mac %>
+# VAGRANT-BEGIN: <%= ip %>
 host <%= name %> {
         hardware ethernet <%= mac %>;
         fixed-address <%= ip %>;
@@ -6,4 +6,4 @@ host <%= name %> {
         option domain-name "";
         option routers 0.0.0.0;
 }
-# VAGRANT-END: <%= mac %>
+# VAGRANT-END: <%= ip %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmware-dhcp
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Israel Shirk