vagrant-unbundled 2.2.7.0 → 2.2.16.0

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

@@ -6,22 +6,22 @@ module VagrantPlugins
       class MountVirtualBoxSharedFolder
         extend SyncedFolder::UnixMountHelpers
 
+        # Mounts and virtualbox folder on linux guest
+        #
+        # @param [Machine] machine
+        # @param [String] name of mount
+        # @param [String] path of mount on guest
+        # @param [Hash] hash of mount options 
         def self.mount_virtualbox_shared_folder(machine, name, guestpath, options)
           guest_path = Shellwords.escape(guestpath)
+          mount_type = options[:plugin].capability(:mount_type)
 
           @@logger.debug("Mounting #{name} (#{options[:hostpath]} to #{guestpath})")
 
-          builtin_mount_type = "-cit vboxsf"
-          addon_mount_type = "-t vboxsf"
+          builtin_mount_type = "-cit #{mount_type}"
+          addon_mount_type = "-t #{mount_type}"
 
-          mount_options = options.fetch(:mount_options, [])
-          detected_ids = detect_owner_group_ids(machine, guest_path, mount_options, options)
-          mount_uid = detected_ids[:uid]
-          mount_gid = detected_ids[:gid]
-
-          mount_options << "uid=#{mount_uid}"
-          mount_options << "gid=#{mount_gid}"
-          mount_options = mount_options.join(',')
+          mount_options, mount_uid, mount_gid = options[:plugin].capability(:mount_options, name, guest_path, options)
           mount_command = "mount #{addon_mount_type} -o #{mount_options} #{name} #{guest_path}"
 
           # Create the guest path if it doesn't exist
@@ -61,7 +61,6 @@ module VagrantPlugins
           emit_upstart_notification(machine, guest_path)
         end
 
-
         def self.unmount_virtualbox_shared_folder(machine, guestpath, options)
           guest_path = Shellwords.escape(guestpath)
 

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

@@ -0,0 +1,74 @@
+require "vagrant/util"
+
+require_relative "../../../synced_folders/unix_mount_helpers"
+
+module VagrantPlugins
+  module GuestLinux
+    module Cap
+      class PersistMountSharedFolder
+        extend SyncedFolder::UnixMountHelpers
+
+        @@logger = Log4r::Logger.new("vagrant::guest::linux::persist_mount_shared_folders")
+
+        # Inserts fstab entry for a set of synced folders. Will fully replace
+        # the currently managed group of Vagrant managed entries. Note, passing
+        # empty list of folders will just remove entries
+        #
+        # @param [Machine] machine The machine to run the action on
+        # @param [Map<String, Map>] A map of folders to add to fstab
+        def self.persist_mount_shared_folder(machine, folders)
+          if folders.nil?
+            @@logger.info("clearing /etc/fstab")
+            self.remove_vagrant_managed_fstab(machine)
+            return
+          end
+
+          ssh_info = machine.ssh_info
+          export_folders = folders.map { |type, folder|
+            folder.map { |name, data|
+              if data[:plugin].capability?(:mount_type)
+                guest_path = Shellwords.escape(data[:guestpath])
+                data[:owner] ||= ssh_info[:username]
+                data[:group] ||= ssh_info[:username]
+                mount_type = data[:plugin].capability(:mount_type)
+                mount_options, _, _ = data[:plugin].capability(
+                  :mount_options, name, guest_path, data)
+                if data[:plugin].capability?(:mount_name)
+                  name = data[:plugin].capability(:mount_name, name, data)
+                end
+              else
+                next
+              end
+
+              {
+                name: name,
+                mount_point: guest_path,
+                mount_type: mount_type,
+                mount_options: mount_options,
+              }
+            }
+          }.flatten.compact
+
+
+          fstab_entry = Vagrant::Util::TemplateRenderer.render('guests/linux/etc_fstab', folders: export_folders)
+          self.remove_vagrant_managed_fstab(machine)
+          machine.communicate.sudo("echo '#{fstab_entry}' >> /etc/fstab")
+        end
+
+        private
+
+        def self.fstab_exists?(machine)
+          machine.communicate.test("test -f /etc/fstab")
+        end
+
+        def self.remove_vagrant_managed_fstab(machine)
+          if fstab_exists?(machine)
+            machine.communicate.sudo("sed -i '/\#VAGRANT-BEGIN/,/\#VAGRANT-END/d' /etc/fstab")
+          else
+            @@logger.info("no fstab file found, carrying on")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,16 +1,27 @@
+require 'vagrant/util/guest_inspection'
 require "log4r"
 
 module VagrantPlugins
   module GuestLinux
     module Cap
       class Reboot
-        MAX_REBOOT_RETRY_DURATION = 120
+        extend Vagrant::Util::GuestInspection::Linux
+
+        DEFAULT_MAX_REBOOT_RETRY_DURATION = 120
+        WAIT_SLEEP_TIME = 5
 
         def self.reboot(machine)
           @logger = Log4r::Logger.new("vagrant::linux::reboot")
-          reboot_script = "reboot"
+          reboot_script = "ps -q 1 -o comm=,start= > /tmp/.vagrant-reboot"
+
+          if systemd?(machine.communicate)
+            reboot_cmd = "systemctl reboot"
+          else
+            reboot_cmd = "reboot"
+          end
 
           comm = machine.communicate
+          reboot_script += "; #{reboot_cmd}"
 
           @logger.debug("Issuing reboot command for guest")
           comm.sudo(reboot_script)
@@ -19,21 +30,39 @@ 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 Vagrant::Errors::MachineGuestNotReady => e
+          rescue Vagrant::Errors::MachineGuestNotReady
             raise if wait_remaining < 0
             @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
 
         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/linux/plugin.rb

@@ -11,6 +11,11 @@ module VagrantPlugins
         Guest
       end
 
+      guest_capability(:linux, :change_host_name) do
+        require_relative "cap/change_host_name"
+        Cap::ChangeHostName
+      end
+
       guest_capability(:linux, :choose_addressable_ip_addr) do
         require_relative "cap/choose_addressable_ip_addr"
         Cap::ChooseAddressableIPAddr
@@ -61,6 +66,11 @@ module VagrantPlugins
         Cap::MountVirtualBoxSharedFolder
       end
 
+      guest_capability(:linux, :persist_mount_shared_folder) do
+        require_relative "cap/persist_mount_shared_folder"
+        Cap::PersistMountSharedFolder
+      end
+
       guest_capability(:linux, :network_interfaces) do
         require_relative "cap/network_interfaces"
         Cap::NetworkInterfaces

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

@@ -1,24 +1,18 @@
+require_relative '../../linux/cap/change_host_name'
+
 module VagrantPlugins
   module GuestOmniOS
     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
-              echo '#{name}' > /etc/nodename
-              hostname '#{name}'
+        extend VagrantPlugins::GuestLinux::Cap::ChangeHostName
 
-              # Prepend ourselves to /etc/hosts
-              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
+        def self.change_name_command(name)
+          basename = name.split(".", 2)[0]
+          return <<-EOH.gsub(/^ {14}/, "")
+          # Set hostname
+          echo '#{name}' > /etc/nodename
+          hostname '#{name}'
+          EOH
         end
       end
     end

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

@@ -1,7 +1,11 @@
+require 'vagrant/util/guest_hosts'
+
 module VagrantPlugins
   module GuestOpenBSD
     module Cap
       class ChangeHostName
+        extend Vagrant::Util::GuestHosts::BSD
+
         def self.change_host_name(machine, name)
           comm = machine.communicate
 
@@ -12,15 +16,15 @@ module VagrantPlugins
               hostname '#{name}'
               sed -i'' 's/^hostname=.*$/hostname=\"#{name}\"/' /etc/rc.conf
               echo '#{name}' > /etc/myname
-
-              # Prepend ourselves to /etc/hosts
-              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
             comm.sudo(command, shell: "sh")
           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/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
+