vagrant-unbundled 2.2.7.0 → 2.2.16.0

data/plugins/guests/photon/cap/change_host_name.rb

@@ -1,23 +1,17 @@
+require_relative '../../linux/cap/change_host_name'
+
 module VagrantPlugins
   module GuestPhoton
     module Cap
       class ChangeHostName
-        def self.change_host_name(machine, name)
-          comm = machine.communicate
-
-          if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
-            basename = name.split(".", 2)[0]
-            comm.sudo <<-EOH.gsub(/^ {14}/, '')
-              # Set the hostname
-              echo '#{name}' > /etc/hostname
-              hostname '#{name}'
+        extend VagrantPlugins::GuestLinux::Cap::ChangeHostName
 
-              # Prepend ourselves to /etc/hosts
-              grep -w '#{name}' /etc/hosts || {
-                sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
-              }
-            EOH
-          end
+        def self.change_name_command(name)
+          return <<-EOH.gsub(/^ {14}/, "")
+             # Set the hostname
+            echo '#{name}' > /etc/hostname
+            hostname '#{name}'
+          EOH
         end
       end
     end

data/plugins/guests/pld/cap/change_host_name.rb

@@ -1,27 +1,21 @@
+require_relative '../../linux/cap/change_host_name'
+
 module VagrantPlugins
   module GuestPld
     module Cap
       class ChangeHostName
-        def self.change_host_name(machine, name)
-          comm = machine.communicate
-
-          if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
-            basename = name.split(".", 2)[0]
-            comm.sudo <<-EOH.gsub(/^ {14}/, '')
-              hostname '#{name}'
-              sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network
+        extend VagrantPlugins::GuestLinux::Cap::ChangeHostName
 
-              sed -i 's/\\(DHCP_HOSTNAME=\\).*/\\1\"#{name}\"/' /etc/sysconfig/interfaces/ifcfg-*
+        def self.change_name_command(name)
+          return <<-EOH.gsub(/^ {14}/, "")
+          hostname '#{name}'
+          sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network
 
-              # Prepend ourselves to /etc/hosts
-              grep -w '#{name}' /etc/hosts || {
-                sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
-              }
+          sed -i 's/\\(DHCP_HOSTNAME=\\).*/\\1\"#{name}\"/' /etc/sysconfig/interfaces/ifcfg-*
 
-              # Restart networking
-              service network restart
-            EOH
-          end
+          # Restart networking
+          service network restart
+          EOH
         end
       end
     end

data/plugins/guests/redhat/cap/change_host_name.rb

@@ -1,9 +1,12 @@
+require 'vagrant/util/guest_hosts'
+
 module VagrantPlugins
   module GuestRedHat
     module Cap
       class ChangeHostName
 
         extend Vagrant::Util::GuestInspection::Linux
+        extend Vagrant::Util::GuestHosts::Linux
 
         def self.change_host_name(machine, name)
           comm = machine.communicate
@@ -12,14 +15,13 @@ module VagrantPlugins
             basename = name.split('.', 2)[0]
             comm.sudo <<-EOH.gsub(/^ {14}/, '')
               # Update sysconfig
-              sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network
+              if [ -f /etc/sysconfig/network ]; then
+                sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network
+              fi
               # Update DNS
-              sed -i 's/\\(DHCP_HOSTNAME=\\).*/\\1\"#{basename}\"/' /etc/sysconfig/network-scripts/ifcfg-*
+              find /etc/sysconfig/network-scripts -maxdepth 1 -type f -name 'ifcfg-*' | xargs -r sed -i 's/\\(DHCP_HOSTNAME=\\).*/\\1\"#{basename}\"/'
               # Set the hostname - use hostnamectl if available
               echo '#{name}' > /etc/hostname
-              grep -w '#{name}' /etc/hosts || {
-                sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
-              }
             EOH
 
             if hostnamectl?(comm)
@@ -40,6 +42,13 @@ module VagrantPlugins
             end
             comm.sudo(restart_command)
           end
+          
+          network_with_hostname = machine.config.vm.networks.map {|_, c| c if c[:hostname] }.compact[0]
+          if network_with_hostname
+            replace_host(comm, name, network_with_hostname[:ip])
+          else
+            add_hostname_to_loopback_interface(comm, name)
+          end
         end
       end
     end

data/plugins/guests/redhat/cap/flavor.rb

@@ -10,8 +10,10 @@ module VagrantPlugins
           end
 
           # Detect various flavors we care about
-          if output =~ /(CentOS|Red Hat Enterprise|Scientific|Cloud|Virtuozzo)\s*Linux( .+)? release 7/i
+          if output =~ /(Red Hat Enterprise|Scientific|Cloud|Virtuozzo)\s*Linux( .+)? release 7/i
             return :rhel_7
+          elsif output =~ /(Red Hat Enterprise|Scientific|Cloud|Virtuozzo)\s*Linux( .+)? release 8/i
+            return :rhel_8
           else
             return :rhel
           end

data/plugins/guests/redhat/cap/smb.rb

@@ -0,0 +1,20 @@
+module VagrantPlugins
+  module GuestRedHat
+    module Cap
+      class SMB
+        def self.smb_install(machine)
+          comm = machine.communicate
+          if !comm.test("test -f /sbin/mount.cifs")
+            comm.sudo <<-EOH.gsub(/^ {14}/, '')
+              if command -v dnf; then
+                dnf -y install cifs-utils
+              else
+                yum -y install cifs-utils
+              fi
+            EOH
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/guests/redhat/plugin.rb

@@ -40,6 +40,11 @@ module VagrantPlugins
         require_relative "cap/rsync"
         Cap::RSync
       end
+
+      guest_capability(:redhat, :smb_install) do
+        require_relative "cap/smb"
+        Cap::SMB
+      end
     end
   end
 end

data/plugins/guests/slackware/cap/change_host_name.rb

@@ -1,25 +1,19 @@
+require_relative '../../linux/cap/change_host_name'
+
 module VagrantPlugins
   module GuestSlackware
     module Cap
       class ChangeHostName
-        def self.change_host_name(machine, name)
-          comm = machine.communicate
-
-          if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
-            basename = name.split(".", 2)[0]
-            comm.sudo <<-EOH.gsub(/^ {14}/, '')
-              # Set the hostname
-              chmod o+w /etc/hostname
-              echo '#{name}' > /etc/hostname
-              chmod o-w /etc/hostname
-              hostname -F /etc/hostname
+        extend VagrantPlugins::GuestLinux::Cap::ChangeHostName
 
-              # Prepend ourselves to /etc/hosts
-              grep -w '#{name}' /etc/hosts || {
-                sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
-              }
-            EOH
-          end
+        def self.change_name_command(name)
+          return <<-EOH.gsub(/^ {14}/, "")
+          # Set the hostname
+          chmod o+w /etc/hostname
+          echo '#{name}' > /etc/hostname
+          chmod o-w /etc/hostname
+          hostname -F /etc/hostname
+          EOH
         end
       end
     end

data/plugins/guests/solaris11/plugin.rb

@@ -29,6 +29,11 @@ module VagrantPlugins
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
+
+      guest_capability(:solaris11, :shell_expand_guest_path) do
+        require_relative "../linux/cap/shell_expand_guest_path"
+        VagrantPlugins::GuestLinux::Cap::ShellExpandGuestPath
+      end
     end
   end
 end

data/plugins/guests/suse/cap/change_host_name.rb

@@ -1,21 +1,43 @@
+require 'vagrant/util/guest_hosts'
+require 'vagrant/util/guest_inspection'
+
 module VagrantPlugins
   module GuestSUSE
     module Cap
       class ChangeHostName
+
+        extend Vagrant::Util::GuestInspection::Linux
+        extend Vagrant::Util::GuestHosts::Linux
+
         def self.change_host_name(machine, name)
           comm = machine.communicate
-
           basename = name.split(".", 2)[0]
-          if !comm.test('test "$(hostnamectl --static status)" = "#{basename}"', sudo: false)
-            comm.sudo <<-EOH.gsub(/^ {14}/, '')
-              hostnamectl set-hostname '#{basename}'
 
-              # Prepend ourselves to /etc/hosts
-              grep -w '#{name}' /etc/hosts || {
-                sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
-              }
-            EOH
+          network_with_hostname = machine.config.vm.networks.map {|_, c| c if c[:hostname] }.compact[0]
+          if network_with_hostname
+            replace_host(comm, name, network_with_hostname[:ip])
+          else
+            add_hostname_to_loopback_interface(comm, name)
           end
+
+          if hostnamectl?(comm)
+            if !comm.test("test \"$(hostnamectl --static status)\" = \"#{basename}\"", sudo: false)
+              cmd = <<-EOH.gsub(/^ {14}/, "")
+              hostnamectl set-hostname '#{basename}'
+              echo #{name} > /etc/HOSTNAME
+              EOH
+              comm.sudo(cmd)
+            end
+          else
+            if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
+              cmd = <<-EOH.gsub(/^ {14}/, "")
+              echo #{name} > /etc/HOSTNAME
+              hostname '#{basename}'
+              EOH
+              comm.sudo(cmd)
+            end
+          end
+
         end
       end
     end

data/plugins/guests/windows/cap/public_key.rb

@@ -37,7 +37,7 @@ module VagrantPlugins
 
           # Ensure the user's ssh directory exists
           remote_ssh_dir = "#{home_dir}\\.ssh"
-          comm.execute("dir \"#{remote_ssh_dir}\"\n if errorlevel 1 (mkdir \"#{remote_ssh_dir}\")", shell: "cmd")
+          comm.execute("New-Item -Path '#{remote_ssh_dir}' -ItemType directory -Force", shell: "powershell")
           remote_upload_path = "#{temp_dir}\\vagrant-insert-pubkey-#{Time.now.to_i}"
           remote_authkeys_path = "#{remote_ssh_dir}\\authorized_keys"
 
@@ -55,7 +55,7 @@ module VagrantPlugins
           File.write(keys_file.path, keys.join("\r\n") + "\r\n")
           comm.upload(keys_file.path, remote_upload_path)
           keys_file.delete
-          comm.execute <<-EOC.gsub(/^\s*/, ""), shell: "powershell"
+          comm.execute(<<-EOC.gsub(/^\s*/, ""), shell: "powershell")
             Set-Acl "#{remote_upload_path}" (Get-Acl "#{remote_authkeys_path}")
             Move-Item -Force "#{remote_upload_path}" "#{remote_authkeys_path}"
           EOC
@@ -67,7 +67,7 @@ module VagrantPlugins
         # @return [Hash] {:temp, :home}
         def self.fetch_guest_paths(communicator)
           output = ""
-          communicator.execute("echo %TEMP%\necho %USERPROFILE%", shell: "cmd") do |type, data|
+          communicator.execute("Write-Output $env:TEMP\nWrite-Output $env:USERPROFILE", shell: "powershell") do |type, data|
             if type == :stdout
               output << data
             end

data/plugins/guests/windows/cap/reboot.rb

@@ -4,7 +4,8 @@ module VagrantPlugins
   module GuestWindows
     module Cap
       class Reboot
-        MAX_REBOOT_RETRY_DURATION = 120
+        DEFAULT_MAX_REBOOT_RETRY_DURATION = 120
+        WAIT_SLEEP_TIME = 5
 
         def self.reboot(machine)
           @logger = Log4r::Logger.new("vagrant::windows::reboot")
@@ -25,14 +26,18 @@ module VagrantPlugins
 
           @logger.debug("Waiting for machine to finish rebooting")
 
-          wait_remaining = MAX_REBOOT_RETRY_DURATION
+          wait_remaining = ENV.fetch("VAGRANT_MAX_REBOOT_RETRY_DURATION",
+            DEFAULT_MAX_REBOOT_RETRY_DURATION).to_i
+          wait_remaining = DEFAULT_MAX_REBOOT_RETRY_DURATION if wait_remaining < 1
+
           begin
             wait_for_reboot(machine)
-          rescue HTTPClient::ConnectTimeoutError, Vagrant::Errors::MachineGuestNotReady, WinRM::WinRMHTTPTransportError => e
+          rescue => err
             raise if wait_remaining < 0
+            @logger.debug("Exception caught while waiting for reboot: #{err}")
             @logger.warn("Machine not ready, cannot start reboot yet. Trying again")
-            sleep(5)
-            wait_remaining -= 5
+            sleep(WAIT_SLEEP_TIME)
+            wait_remaining -= WAIT_SLEEP_TIME
             retry
           end
         end

data/plugins/hosts/darwin/cap/fs_iso.rb

@@ -0,0 +1,49 @@
+require "pathname"
+require "vagrant/util/caps"
+
+module VagrantPlugins
+  module HostDarwin
+    module Cap
+      class FsISO
+        extend Vagrant::Util::Caps::BuildISO
+        
+        @@logger = Log4r::Logger.new("vagrant::host::darwin::fs_iso")
+
+        BUILD_ISO_CMD = "hdiutil".freeze
+
+        # Check that the host has the ability to generate ISOs
+        #
+        # @param [Vagrant::Environment] env
+        # @return [Boolean]
+        def self.isofs_available(env)
+          !!Vagrant::Util::Which.which(BUILD_ISO_CMD)
+        end
+
+        # Generate an ISO file of the given source directory
+        #
+        # @param [Vagrant::Environment] env
+        # @param [String] source_directory Contents of ISO
+        # @param [Map] extra arguments to pass to the iso building command
+        #              :file_destination (string) location to store ISO
+        #              :volume_id (String) to set the volume name 
+        # @return [Pathname] ISO location
+        # @note If file_destination exists, source_directory will be checked
+        #       for recent modifications and a new ISO will be generated if requried.
+        def self.create_iso(env, source_directory, extra_opts={})
+          source_directory = Pathname.new(source_directory)
+          file_destination = self.ensure_output_iso(extra_opts[:file_destination])
+
+          iso_command = [BUILD_ISO_CMD, "makehybrid", "-hfs", "-iso", "-joliet", "-ov"]
+          iso_command.concat(["-default-volume-name", extra_opts[:volume_id]]) if extra_opts[:volume_id]
+          iso_command << "-o"
+          iso_command << file_destination.to_s
+          iso_command << source_directory.to_s
+          self.build_iso(iso_command, source_directory, file_destination)
+
+          @@logger.info("ISO available at #{file_destination}")
+          file_destination
+        end
+      end
+    end
+  end
+end

data/plugins/hosts/darwin/plugin.rb

@@ -11,6 +11,16 @@ module VagrantPlugins
         Host
       end
 
+      host_capability("darwin", "isofs_available") do
+        require_relative "cap/fs_iso"
+        Cap::FsISO
+      end
+
+      host_capability("darwin", "create_iso") do
+        require_relative "cap/fs_iso"
+        Cap::FsISO
+      end
+
       host_capability("darwin", "provider_install_virtualbox") do
         require_relative "cap/provider_install_virtualbox"
         Cap::ProviderInstallVirtualBox

data/plugins/hosts/linux/cap/fs_iso.rb

@@ -0,0 +1,49 @@
+require "pathname"
+require "vagrant/util/caps"
+
+module VagrantPlugins
+  module HostLinux
+    module Cap
+      class FsISO
+        extend Vagrant::Util::Caps::BuildISO
+
+        @@logger = Log4r::Logger.new("vagrant::host::linux::fs_iso")
+
+        BUILD_ISO_CMD = "mkisofs".freeze
+
+        # Check that the host has the ability to generate ISOs
+        #
+        # @param [Vagrant::Environment] env
+        # @return [Boolean]
+        def self.isofs_available(env)
+          !!Vagrant::Util::Which.which(BUILD_ISO_CMD)
+        end
+
+        # Generate an ISO file of the given source directory
+        #
+        # @param [Vagrant::Environment] env
+        # @param [String] source_directory Contents of ISO
+        # @param [Map] extra arguments to pass to the iso building command
+        #              :file_destination (string) location to store ISO
+        #              :volume_id (String) to set the volume name
+        # @return [Pathname] ISO location
+        # @note If file_destination exists, source_directory will be checked
+        #       for recent modifications and a new ISO will be generated if requried.
+        def self.create_iso(env, source_directory, extra_opts={})
+          source_directory = Pathname.new(source_directory)
+          file_destination = self.ensure_output_iso(extra_opts[:file_destination])
+
+          iso_command = [BUILD_ISO_CMD, "-joliet"]
+          iso_command.concat(["-volid", extra_opts[:volume_id]]) if extra_opts[:volume_id]
+          iso_command << "-o"
+          iso_command << file_destination.to_s
+          iso_command << source_directory.to_s
+          self.build_iso(iso_command, source_directory, file_destination)
+
+          @@logger.info("ISO available at #{file_destination}")
+          file_destination
+        end
+      end
+    end
+  end
+end