vagrant-unbundled 2.2.6.2 → 2.2.14.0

data/plugins/communicators/winssh/config.rb

@@ -12,15 +12,11 @@ module VagrantPlugins
       end
 
       def finalize!
-        @shell = "cmd" if @shell == UNSET_VALUE
+        @shell = "powershell" if @shell == UNSET_VALUE
         @sudo_command = "%c" if @sudo_command == UNSET_VALUE
-        @upload_directory = "C:\\Windows\\Temp" if @upload_directory == UNSET_VALUE
+        @upload_directory = "C:/Windows/Temp" if @upload_directory == UNSET_VALUE
         if @export_command_template == UNSET_VALUE
-          if @shell == "cmd"
-            @export_command_template = 'set %ENV_KEY%="%ENV_VALUE%"'
-          else
-            @export_command_template = '$env:%ENV_KEY%="%ENV_VALUE%"'
-          end
+          @export_command_template = '$env:%ENV_KEY%="%ENV_VALUE%"'
         end
         super
       end

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

@@ -1,7 +1,11 @@
+require 'vagrant/util/guest_hosts'
+
 module VagrantPlugins
   module GuestAlpine
     module Cap
       class ChangeHostName
+        include Vagrant::Util::GuestHosts::Linux
+
         def self.change_host_name(machine, name)
           new(machine, name).change!
         end
@@ -14,10 +18,10 @@ module VagrantPlugins
         end
 
         def change!
+          update_etc_hosts
           return unless should_change?
 
           update_etc_hostname
-          update_etc_hosts
           refresh_hostname_service
           update_mailname
           renew_dhcp
@@ -48,17 +52,12 @@ module VagrantPlugins
         # 127.0.0.1   localhost
         # 127.0.1.1   host.fqdn.com host.fqdn host
         def update_etc_hosts
-          if machine.communicate.test("grep '#{current_hostname}' /etc/hosts")
-            # Current hostname entry is in /etc/hosts
-            ip_address = '([0-9]{1,3}\.){3}[0-9]{1,3}'
-            search     = "^(#{ip_address})\\s+#{Regexp.escape(current_hostname)}(\\s.*)?$"
-            replace    = "\\1 #{new_hostname} #{short_hostname}"
-            expression = ['s', search, replace, 'g'].join('@')
-
-            machine.communicate.sudo("sed -ri '#{expression}' /etc/hosts")
+          comm = machine.communicate
+          network_with_hostname = machine.config.vm.networks.map {|_, c| c if c[:hostname] }.compact[0]
+          if network_with_hostname
+            replace_host(comm, new_hostname, network_with_hostname[:ip])
           else
-            # Current hostname entry isn't in /etc/hosts, just append it
-            machine.communicate.sudo("echo '127.0.1.1 #{new_hostname} #{short_hostname}' >>/etc/hosts")
+            add_hostname_to_loopback_interface(comm, new_hostname)
           end
         end
 

data/plugins/guests/alpine/cap/rsync.rb

@@ -8,7 +8,7 @@ module VagrantPlugins
 
         def self.rsync_install(machine)
           machine.communicate.tap do |comm|
-            comm.sudo('apk add rsync')
+            comm.sudo('apk add --update-cache rsync')
           end
         end
       end

data/plugins/guests/alpine/plugin.rb

@@ -45,6 +45,22 @@ module VagrantPlugins
         require_relative 'cap/smb'
         Cap::SMB
       end
+
+      def self.check_community_plugin
+        plugins = Vagrant::Plugin::Manager.instance.installed_plugins
+        if plugins.keys.include?("vagrant-alpine")
+          $stderr.puts <<-EOF
+WARNING: Vagrant has detected the `vagrant-alpine` plugin. This plugin's
+functionality has been merged into the main Vagrant project and should be
+considered deprecated. To uninstall the plugin, run the command shown below:
+
+  vagrant plugin uninstall vagrant-alpine
+
+EOF
+        end
+      end
+
+      self.check_community_plugin
     end
   end
 end

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

@@ -1,63 +1,50 @@
+require_relative '../../linux/cap/change_host_name'
+
 module VagrantPlugins
   module GuestALT
     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}/, '')
-              # Save current hostname saved in /etc/hosts
-              CURRENT_HOSTNAME_FULL="$(hostname -f)"
-              CURRENT_HOSTNAME_SHORT="$(hostname -s)"
-
-              # New hostname to be saved in /etc/hosts
-              NEW_HOSTNAME_FULL='#{name}'
-              NEW_HOSTNAME_SHORT="${NEW_HOSTNAME_FULL%%.*}"
-
-              # Set the hostname - use hostnamectl if available
-              if command -v hostnamectl; then
-                hostnamectl set-hostname --static '#{name}'
-                hostnamectl set-hostname --transient '#{name}'
-              else
-                hostname '#{name}'
-              fi
-
-              # Update ourselves in /etc/hosts
-              if grep -w "$CURRENT_HOSTNAME_FULL" /etc/hosts; then
-                sed -i -e "s/\(\s\)$CURRENT_HOSTNAME_FULL\(\s\)/\1$NEW_HOSTNAME_FULL\2/g" -e "s/\(\s\)$CURRENT_HOSTNAME_FULL$/\1$NEW_HOSTNAME_FULL/g" /etc/hosts
-              fi
-              if grep -w "$CURRENT_HOSTNAME_SHORT" /etc/hosts; then
-                sed -i -e "s/\(\s\)$CURRENT_HOSTNAME_SHORT\(\s\)/\1$NEW_HOSTNAME_SHORT\2/g" -e "s/\(\s\)$CURRENT_HOSTNAME_SHORT$/\1$NEW_HOSTNAME_SHORT/g" /etc/hosts
-              fi
+        extend VagrantPlugins::GuestLinux::Cap::ChangeHostName
+        
+        def self.change_name_command(name)
+          basename = name.split(".", 2)[0]
+          return <<-EOH.gsub(/^ {14}/, '')
+          # Save current hostname saved in /etc/hosts
+          CURRENT_HOSTNAME_FULL="$(hostname -f)"
+          CURRENT_HOSTNAME_SHORT="$(hostname -s)"
 
-              # Persist hostname change across reboots
-              if [ -f /etc/sysconfig/network ]; then
-                sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network
-              elif [ -f /etc/hostname ]; then
-                sed -i 's/.*/#{name}/' /etc/hostname
-              else
-                echo 'Unrecognized system. Hostname change may not persist across reboots.'
-                exit 0
-              fi
+          # Set the hostname - use hostnamectl if available
+          if command -v hostnamectl; then
+            hostnamectl set-hostname --static '#{name}'
+            hostnamectl set-hostname --transient '#{name}'
+          else
+            hostname '#{name}'
+          fi
 
-              # Restart the network if we find a recognized SYS V init script
-              if command -v service; then
-                if [ -f /etc/init.d/network ]; then
-                  service network restart
-                elif [ -f /etc/init.d/networking ]; then
-                  service networking restart
-                elif [ -f /etc/init.d/NetworkManager ]; then
-                  service NetworkManager restart
-                else
-                  echo 'Unrecognized system. Networking was not restarted following hostname change.'
-                  exit 0
-                fi
-              fi
+          # Persist hostname change across reboots
+          if [ -f /etc/sysconfig/network ]; then
+            sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network
+          elif [ -f /etc/hostname ]; then
+            sed -i 's/.*/#{name}/' /etc/hostname
+          else
+            echo 'Unrecognized system. Hostname change may not persist across reboots.'
+            exit 0
+          fi
 
-            EOH
-          end
+          # Restart the network if we find a recognized SYS V init script
+          if command -v service; then
+            if [ -f /etc/init.d/network ]; then
+              service network restart
+            elif [ -f /etc/init.d/networking ]; then
+              service networking restart
+            elif [ -f /etc/init.d/NetworkManager ]; then
+              service NetworkManager restart
+            else
+              echo 'Unrecognized system. Networking was not restarted following hostname change.'
+              exit 0
+            fi
+          fi
+          EOH
         end
       end
     end

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

@@ -1,22 +1,13 @@
+require_relative '../../linux/cap/change_host_name'
+
 module VagrantPlugins
   module GuestArch
     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 hostname
-              hostnamectl set-hostname '#{basename}'
+        extend VagrantPlugins::GuestLinux::Cap::ChangeHostName
 
-              # Prepend ourselves to /etc/hosts
-              test $? -eq 0 && (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)
+          "hostnamectl set-hostname '#{name.split(".", 2).first}'"
         end
       end
     end

data/plugins/guests/arch/cap/configure_networks.rb

@@ -9,10 +9,12 @@ module VagrantPlugins
     module Cap
       class ConfigureNetworks
         include Vagrant::Util
+        extend Vagrant::Util::GuestInspection::Linux
 
         def self.configure_networks(machine, networks)
           comm = machine.communicate
           commands = []
+          uses_systemd_networkd = systemd_networkd?(comm)
 
           interfaces = machine.guest.capability(:network_interfaces)
           networks.each.with_index do |network, i|
@@ -25,9 +27,15 @@ module VagrantPlugins
               network[:netmask] = (32-Math.log2((IPAddr.new(network[:netmask], Socket::AF_INET).to_i^0xffffffff)+1)).to_i
             end
 
-            entry = TemplateRenderer.render("guests/arch/network_#{network[:type]}",
-              options: network,
-            )
+            if uses_systemd_networkd
+              entry = TemplateRenderer.render("guests/arch/systemd_networkd/network_#{network[:type]}",
+                options: network,
+              )
+            else
+              entry = TemplateRenderer.render("guests/arch/default_network/network_#{network[:type]}",
+                options: network,
+              )
+            end
 
             remote_path = "/tmp/vagrant-network-#{network[:device]}-#{Time.now.to_i}-#{i}"
 
@@ -39,13 +47,22 @@ module VagrantPlugins
               comm.upload(f.path, remote_path)
             end
 
-            commands << <<-EOH.gsub(/^ {14}/, '').rstrip
-              # Configure #{network[:device]}
-              mv '#{remote_path}' '/etc/netctl/#{network[:device]}' &&
-              ip link set '#{network[:device]}' down &&
-              netctl restart '#{network[:device]}' &&
-              netctl enable '#{network[:device]}'
-            EOH
+            if uses_systemd_networkd
+              commands << <<-EOH.gsub(/^ {16}/, '').rstrip
+                # Configure #{network[:device]}
+                chmod 0644 '#{remote_path}' &&
+                mv '#{remote_path}' '/etc/systemd/network/#{network[:device]}.network' &&
+                networkctl reload
+              EOH
+            else
+              commands << <<-EOH.gsub(/^ {16}/, '').rstrip
+                # Configure #{network[:device]}
+                mv '#{remote_path}' '/etc/netctl/#{network[:device]}' &&
+                ip link set '#{network[:device]}' down &&
+                netctl restart '#{network[:device]}' &&
+                netctl enable '#{network[:device]}'
+              EOH
+            end
           end
 
           # Run all the network modification commands in one communicator call.

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

@@ -7,7 +7,7 @@ module VagrantPlugins
           if !comm.test("test -f /usr/bin/mount.cifs")
             comm.sudo <<-EOH.gsub(/^ {14}/, '')
               pacman -Sy --noconfirm
-              pacman -S --noconfirm cifs-utils
+              pacman -S --noconfirm smbclient cifs-utils
             EOH
           end
         end

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

@@ -1,22 +1,13 @@
+require_relative '../../linux/cap/change_host_name'
+
 module VagrantPlugins
   module GuestAtomic
     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 hostname
-              hostnamectl set-hostname '#{basename}'
+        extend VagrantPlugins::GuestLinux::Cap::ChangeHostName
 
-              # Prepend ourselves to /etc/hosts
-              test $? -eq 0 && (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)
+          "hostnamectl set-hostname '#{name.split(".", 2).first}'"
         end
       end
     end

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

@@ -0,0 +1,24 @@
+module VagrantPlugins
+  module GuestCentos
+    module Cap
+      class Flavor
+        def self.flavor(machine)
+          # Read the version file
+          output = ""
+          machine.communicate.sudo("cat /etc/centos-release") do |_, data|
+            output = data
+          end
+
+          # Detect various flavors we care about
+          if output =~ /(CentOS)( .+)? 7/i
+            return :centos_7
+          elsif output =~ /(CentOS)( .+)? 8/i
+            return :centos_8
+          else
+            return :centos
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/guests/centos/guest.rb

@@ -0,0 +1,9 @@
+module VagrantPlugins
+  module GuestCentos
+    class Guest < Vagrant.plugin("2", :guest)
+      def detect?(machine)
+        machine.communicate.test("cat /etc/centos-release")
+      end
+    end
+  end
+end

data/plugins/guests/centos/plugin.rb

@@ -0,0 +1,20 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestCentos
+    class Plugin < Vagrant.plugin("2")
+      name "CentOS guest"
+      description "CentOS guest support."
+
+      guest(:centos, :redhat) do
+        require_relative "guest"
+        Guest
+      end
+
+      guest_capability(:centos, :flavor) do
+        require_relative "cap/flavor"
+        Cap::Flavor
+      end
+    end
+  end
+end

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

@@ -1,7 +1,11 @@
+require 'vagrant/util/guest_hosts'
+
 module VagrantPlugins
   module GuestDarwin
     module Cap
       class ChangeHostName
+        extend Vagrant::Util::GuestHosts::BSD
+
         def self.change_host_name(machine, name)
           comm = machine.communicate
 
@@ -21,14 +25,14 @@ module VagrantPlugins
               fi
 
               hostname '#{name}'
-
-              # Prepend ourselves to /etc/hosts - sed on bsd is sad
-              grep -w '#{name}' /etc/hosts || {
-                echo -e '127.0.0.1\\t#{name}\\t#{basename}' | cat - /etc/hosts > /tmp/tmp-hosts &&
-                  mv /tmp/tmp-hosts /etc/hosts
-              }
             EOH
           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/darwin/cap/darwin_version.rb

@@ -0,0 +1,40 @@
+module VagrantPlugins
+  module GuestDarwin
+    module Cap
+      class DarwinVersion
+        
+        VERSION_REGEX = /\d+.\d+.?\d*/.freeze
+
+        # Get the darwin version
+        #
+        # @param [Machine]
+        # @return [String] version of drawin
+        def self.darwin_version(machine)
+          output = ""
+          machine.communicate.sudo("sysctl kern.osrelease") do |_, data|
+            output = data
+          end
+          output.scan(VERSION_REGEX).first
+        end
+
+        # Get the darwin major version
+        #
+        # @param [Machine]
+        # @return [int] major version of drawin (nil if version is not detected)
+        def self.darwin_major_version(machine)
+          output = ""
+          machine.communicate.sudo("sysctl kern.osrelease") do |_, data|
+            output = data
+          end
+          version_string = output.scan(VERSION_REGEX).first
+          if version_string
+            major_version = version_string.split(".").first.to_i
+          else
+            major_version = nil
+          end
+          major_version
+        end
+      end
+    end
+  end
+end