vagrant-unbundled 2.2.14.0 → 2.2.16.0

data/plugins/commands/cloud/provider/upload.rb

@@ -58,6 +58,16 @@ module VagrantPlugins
               access_token: access_token
             )
 
+            # Include size check on file and disable direct if over 5G
+            if options[:direct]
+              fsize = File.stat(file).size
+              if fsize > (5 * Vagrant::Util::Numeric::GIGABYTE)
+                box_size = Vagrant::Util::Numeric.bytes_to_string(fsize)
+                @env.ui.warn(I18n.t("cloud_command.provider.direct_disable", size: box_size))
+                options[:direct] = false
+              end
+            end
+
             with_provider(account: account, org: org, box: box, version: version, provider: provider) do |p|
               p.upload(direct: options[:direct]) do |upload_url|
                 m = options[:direct] ? :put : :put

data/plugins/commands/cloud/publish.rb

@@ -129,6 +129,16 @@ module VagrantPlugins
         def upload_box_file(provider, box_file, options={})
           box_file = File.absolute_path(box_file)
           @env.ui.info(I18n.t("cloud_command.publish.upload_provider", file: box_file))
+          # Include size check on file and disable direct if over 5G
+          if options[:direct_upload]
+            fsize = File.stat(box_file).size
+            if fsize > (5 * Vagrant::Util::Numeric::GIGABYTE)
+              box_size = Vagrant::Util::Numeric.bytes_to_string(fsize)
+              @env.ui.warn(I18n.t("cloud_command.provider.direct_disable", size: box_size))
+              options[:direct_upload] = false
+            end
+          end
+
           provider.upload(direct: options[:direct_upload]) do |upload_url|
             Vagrant::Util::Uploader.new(upload_url, box_file, ui: @env.ui, method: :put).upload!
           end

data/plugins/commands/cloud/util.rb

@@ -5,8 +5,16 @@ module VagrantPlugins
       def api_server_url
         if Vagrant.server_url == Vagrant::DEFAULT_SERVER_URL
           return "#{Vagrant.server_url}/api/v1"
-        else
-          return Vagrant.server_url
+        end
+        begin
+          addr = URI.parse(Vagrant.server_url)
+          if addr.path.empty? || addr.path.to_s == "/"
+            addr.path = "/api/v1"
+          end
+
+          addr.to_s
+        rescue URI::Error
+          Vagrant.server_url
         end
       end
 

data/plugins/commands/destroy/command.rb

@@ -56,7 +56,7 @@ module VagrantPlugins
         end
 
         machines.each do |m|
-          if m.state.id == init_states[m.name]
+          if init_states[m.name] != :not_created && m.state.id == init_states[m.name]
             declined += 1
           end
         end
@@ -64,10 +64,6 @@ module VagrantPlugins
         # Nothing was declined
         return 0 if declined == 0
 
-        # Everything was declined, and all states are `not_created`
-        return 0 if declined == machines.length &&
-                    declined == init_states.values.count(:not_created)
-
         # Everything was declined, state was not changed
         return 1 if declined == machines.length
 

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

@@ -45,7 +45,7 @@ module VagrantPlugins
             # each specifically, we avoid reconfiguring eth0 (the NAT interface) so
             # SSH never dies.
             interfaces.each do |interface|
-              comm.sudo("/sbin/ifdown eth#{interface} 2> /dev/null")
+              comm.sudo("if [[ $(/sbin/ip a show eth#{interface} | grep UP) ]]; then /sbin/ifdown eth#{interface} 2> /dev/null; fi")
               comm.sudo("/sbin/ip addr flush dev eth#{interface} 2> /dev/null")
             end
 

data/plugins/guests/fedora/guest.rb

@@ -1,11 +1,11 @@
 require "vagrant"
+require_relative '../linux/guest'
 
 module VagrantPlugins
   module GuestFedora
-    class Guest < Vagrant.plugin("2", :guest)
-      def detect?(machine)
-        machine.communicate.test("grep 'Fedora release' /etc/redhat-release")
-      end
+    class Guest < VagrantPlugins::GuestLinux::Guest
+      # Name used for guest detection
+      GUEST_DETECTION_NAME = "fedora".freeze
     end
   end
 end

data/plugins/guests/linux/cap/mount_smb_shared_folder.rb

@@ -20,7 +20,7 @@ module VagrantPlugins
             :shell_expand_guest_path, guestpath)
           options[:smb_id] ||= name
 
-          mount_device = options[:plugin].capability(:mount_name, options)
+          mount_device = options[:plugin].capability(:mount_name, name, options)
           mount_options, _, _ = options[:plugin].capability(
             :mount_options, name, expanded_guest_path, options)
           mount_type = options[:plugin].capability(:mount_type)

data/plugins/guests/linux/cap/persist_mount_shared_folder.rb

@@ -34,13 +34,12 @@ module VagrantPlugins
                 mount_options, _, _ = data[:plugin].capability(
                   :mount_options, name, guest_path, data)
                 if data[:plugin].capability?(:mount_name)
-                  name = data[:plugin].capability(:mount_name, data)
+                  name = data[:plugin].capability(:mount_name, name, data)
                 end
               else
                 next
               end
 
-              mount_options = "#{mount_options},nofail"
               {
                 name: name,
                 mount_point: guest_path,

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

@@ -12,13 +12,16 @@ module VagrantPlugins
 
         def self.reboot(machine)
           @logger = Log4r::Logger.new("vagrant::linux::reboot")
+          reboot_script = "ps -q 1 -o comm=,start= > /tmp/.vagrant-reboot"
+
           if systemd?(machine.communicate)
-            reboot_script = "systemctl reboot"
+            reboot_cmd = "systemctl reboot"
           else
-            reboot_script = "reboot"
+            reboot_cmd = "reboot"
           end
 
           comm = machine.communicate
+          reboot_script += "; #{reboot_cmd}"
 
           @logger.debug("Issuing reboot command for guest")
           comm.sudo(reboot_script)
@@ -43,8 +46,23 @@ module VagrantPlugins
         end
 
         def self.wait_for_reboot(machine)
-          while !machine.guest.ready?
+          caught = false
+          begin
+            check_script = 'grep "$(ps -q 1 -o comm=,start=)" /tmp/.vagrant-reboot'
+            while machine.guest.ready? && machine.communicate.execute(check_script, error_check: false) == 0
+              sleep 10
+            end
+          rescue
+            # The check script execution may result in an exception
+            # getting raised depending on the state of the communicator
+            # when executing. We'll allow for it to happen once, and then
+            # raise if we get an exception again
+            if caught
+              raise
+            end
+            caught = true
             sleep 10
+            retry
           end
         end
       end

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

@@ -0,0 +1,19 @@
+module VagrantPlugins
+  module GuestOpenWrt
+    module Cap
+      class ChangeHostName
+        def self.change_host_name(machine, name)
+          comm = machine.communicate
+
+          if !comm.test("uci get system.@system[0].hostname | grep '^#{name}$'", sudo: false)
+            comm.execute <<~EOH
+              uci set system.@system[0].hostname='#{name}'
+              uci commit system
+              /etc/init.d/system reload
+            EOH
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/guests/openwrt/cap/halt.rb

@@ -0,0 +1,16 @@
+module VagrantPlugins
+  module GuestOpenWrt
+    module Cap
+      class Halt
+        def self.halt(machine)
+          begin
+            machine.communicate.execute("halt")
+          rescue IOError, Vagrant::Errors::SSHDisconnected
+            # Ignore, this probably means connection closed because it
+            # shut down.
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/guests/openwrt/cap/insert_public_key.rb

@@ -0,0 +1,20 @@
+require "vagrant/util/shell_quote"
+
+module VagrantPlugins
+  module GuestOpenWrt
+    module Cap
+      class InsertPublicKey
+        def self.insert_public_key(machine, contents)
+          contents = contents.chomp
+          contents = Vagrant::Util::ShellQuote.escape(contents, "'")
+
+          machine.communicate.tap do |comm|
+            comm.execute <<~EOH
+              printf '#{contents}\\n' >> /etc/dropbear/authorized_keys
+            EOH
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/guests/openwrt/cap/remove_public_key.rb

@@ -0,0 +1,22 @@
+require "vagrant/util/shell_quote"
+
+module VagrantPlugins
+  module GuestOpenWrt
+    module Cap
+      class RemovePublicKey
+        def self.remove_public_key(machine, contents)
+          contents = contents.chomp
+          contents = Vagrant::Util::ShellQuote.escape(contents, "'")
+
+          machine.communicate.tap do |comm|
+            comm.execute <<~EOH
+              if test -f /etc/dropbear/authorized_keys ; then
+                sed -i '/^.*#{contents}.*$/d' /etc/dropbear/authorized_keys
+              fi
+            EOH
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+module VagrantPlugins
+  module GuestOpenWrt
+    module Cap
+      class RSync
+        def self.rsync_installed(machine)
+          machine.communicate.test("which rsync")
+        end
+
+        def self.rsync_install(machine)
+          machine.communicate.tap do |comm|
+            comm.execute <<~EOH
+              opkg update
+              opkg install rsync
+            EOH
+          end
+        end
+
+        def self.rsync_pre(machine, opts)
+          machine.communicate.tap do |comm|
+            comm.execute("mkdir -p '#{opts[:guestpath]}'")
+          end
+        end
+
+        def self.rsync_command(machine)
+          "rsync -zz"
+        end
+
+        def self.rsync_post(machine, opts)
+          # Don't do anything because BusyBox's `find` doesn't support the
+          # syntax in plugins/synced_folders/rsync/default_unix_cap.rb.
+        end
+      end
+    end
+  end
+end

data/plugins/guests/openwrt/guest.rb

@@ -0,0 +1,23 @@
+module VagrantPlugins
+  module GuestOpenWrt
+    class Guest
+      # Name used for guest detection
+      GUEST_DETECTION_NAME = "openwrt".freeze
+
+      def detect?(machine)
+        machine.communicate.test <<~EOH
+          if test -e /etc/openwrt_release; then
+            exit
+          fi
+          if test -r /etc/os-release; then
+            source /etc/os-release && test 'x#{self.class.const_get(:GUEST_DETECTION_NAME)}' = "x$ID" && exit
+          fi
+          if test -r /etc/banner; then
+            cat /etc/banner | grep -qi '#{self.class.const_get(:GUEST_DETECTION_NAME)}' && exit
+          fi
+          exit 1
+        EOH
+      end
+    end
+  end
+end

data/plugins/guests/openwrt/plugin.rb

@@ -0,0 +1,61 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestOpenWrt
+    class Plugin < Vagrant.plugin("2")
+      name "OpenWrt guest"
+      description "OpenWrt guest support."
+
+      guest(:openwrt, :linux) do
+        require_relative "guest"
+        Guest
+      end
+
+      guest_capability(:openwrt, :insert_public_key) do
+        require_relative "cap/insert_public_key"
+        Cap::InsertPublicKey
+      end
+
+      guest_capability(:openwrt, :remove_public_key) do
+        require_relative "cap/remove_public_key"
+        Cap::RemovePublicKey
+      end
+
+      guest_capability(:openwrt, :change_host_name) do
+        require_relative "cap/change_host_name"
+        Cap::ChangeHostName
+      end
+
+      guest_capability(:openwrt, :rsync_installed) do
+        require_relative "cap/rsync"
+        Cap::RSync
+      end
+
+      guest_capability(:openwrt, :rsync_install) do
+        require_relative "cap/rsync"
+        Cap::RSync
+      end
+
+      guest_capability(:openwrt, :rsync_pre) do
+        require_relative "cap/rsync"
+        Cap::RSync
+      end
+
+      guest_capability(:openwrt, :rsync_command) do
+        require_relative "cap/rsync"
+        Cap::RSync
+      end
+
+      guest_capability(:openwrt, :rsync_post) do
+        require_relative "cap/rsync"
+        Cap::RSync
+      end
+
+      guest_capability(:openwrt, :halt) do
+        require_relative "cap/halt"
+        Cap::Halt
+      end
+    end
+  end
+end
+

data/plugins/providers/docker/driver.rb

@@ -25,9 +25,9 @@ module VagrantPlugins
         opts = {with_stderr: true}
         result = execute('docker', 'build', *args, opts, &block)
         # Check for the new output format 'writing image sha256...'
-        # In this case, docker builtkit is enabled. Its format is different
+        # In this case, docker buildkit is enabled. Its format is different
         # from standard docker
-        matches = result.scan(/writing image .+:([0-9a-z]+) done/i).last
+        matches = result.scan(/writing image .+:([^\s]+)/i).last
         if !matches
           if podman?
             # Check for podman format when it is emulating docker CLI.

data/plugins/providers/virtualbox/action/network.rb

@@ -255,9 +255,17 @@ module VagrantPlugins
 
           # Make sure the type is a symbol
           options[:type] = options[:type].to_sym
-
-          # Default IP is in the 20-bit private network block for DHCP based networks
-          options[:ip] = "172.28.128.1" if options[:type] == :dhcp && !options[:ip]
+         
+          if options[:type] == :dhcp && !options[:ip]
+            # Try to find a matching device to set the config ip to
+            matching_device = hostonly_find_matching_network(options)
+            if matching_device
+              options[:ip] = matching_device[:ip]
+            else
+              # Default IP is in the 20-bit private network block for DHCP based networks
+              options[:ip] = "172.28.128.1"
+            end
+          end
 
           begin
             ip = IPAddr.new(options[:ip])
@@ -469,7 +477,7 @@ module VagrantPlugins
 
         # This finds a matching host only network for the given configuration.
         def hostonly_find_matching_network(config)
-          this_netaddr = network_address(config[:ip], config[:netmask])
+          this_netaddr = network_address(config[:ip], config[:netmask])  if config[:ip]
 
           @env[:machine].provider.driver.read_host_only_interfaces.each do |interface|
             return interface if config[:name] && config[:name] == interface[:name]
@@ -515,7 +523,6 @@ module VagrantPlugins
         # @param [Hash<String>] config hash as returned from hostonly_config
         def create_dhcp_server_if_necessary(interface, config)
           existing_dhcp_server = find_matching_dhcp_server(interface)
-
           if existing_dhcp_server
             if dhcp_server_matches_config?(existing_dhcp_server, config)
               @logger.debug("DHCP server already properly configured")

data/plugins/providers/virtualbox/cap/mount_options.rb

@@ -22,6 +22,7 @@ module VagrantPlugins
 
           mount_options << "uid=#{mount_uid}"
           mount_options << "gid=#{mount_gid}"
+          mount_options << "_netdev"
           mount_options = mount_options.join(',')
           return mount_options, mount_uid, mount_gid
         end
@@ -29,6 +30,10 @@ module VagrantPlugins
         def self.mount_type(machine)
           return VB_MOUNT_TYPE
         end
+
+        def self.mount_name(machine, name, data)
+          name.gsub(/[\s\/\\]/,'_').sub(/^_/, '')
+        end
       end
     end
   end