vagrant-unbundled 1.8.4.2 → 1.8.5.1

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

@@ -5,7 +5,7 @@ module VagrantPlugins
         def self.change_host_name(machine, name)
           comm = machine.communicate
 
-          if !comm.test("hostname -f | grep -w '#{name}'", sudo: false)
+          if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
             basename = name.split('.', 2)[0]
             comm.sudo <<-EOH.gsub(/^ {14}/, '')
               # Update sysconfig
@@ -17,9 +17,10 @@ module VagrantPlugins
               # Set the hostname - use hostnamectl if available
               echo '#{name}' > /etc/hostname
               if command -v hostnamectl; then
-                hostnamectl set-hostname '#{name}'
+                hostnamectl set-hostname --static '#{name}'
+                hostnamectl set-hostname --transient '#{name}'
               else
-                hostname '#{name}'
+                hostname -F /etc/hostname
               fi
 
               # Remove comments and blank lines from /etc/hosts

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

@@ -1,43 +1,20 @@
 require "tempfile"
 
-require_relative "../../../../lib/vagrant/util/retryable"
 require_relative "../../../../lib/vagrant/util/template_renderer"
 
 module VagrantPlugins
   module GuestRedHat
     module Cap
       class ConfigureNetworks
-        extend Vagrant::Util::Retryable
         include Vagrant::Util
 
         def self.configure_networks(machine, networks)
-          case machine.guest.capability(:flavor)
-          when :rhel_7
-            configure_networks_rhel7(machine, networks)
-          else
-            configure_networks_default(machine, networks)
-          end
-        end
-
-        def self.configure_networks_rhel7(machine, networks)
-          # This is kind of jank but the configure networks is the same as
-          # Fedora at this point.
-          require_relative "../../fedora/cap/configure_networks"
-          ::VagrantPlugins::GuestFedora::Cap::ConfigureNetworks
-            .configure_networks(machine, networks)
-        end
-
-        def self.configure_networks_default(machine, networks)
           comm = machine.communicate
 
           network_scripts_dir = machine.guest.capability(:network_scripts_dir)
 
-          interfaces = []
           commands   = []
-
-          comm.sudo("ifconfig -a | grep -o ^[0-9a-z]* | grep -v '^lo'") do |_, stdout|
-            interfaces = stdout.split("\n")
-          end
+          interfaces = machine.guest.capability(:network_interfaces)
 
           networks.each.with_index do |network, i|
             network[:device] = interfaces[network[:interface]]

data/plugins/guests/redhat/plugin.rb

@@ -6,37 +6,37 @@ module VagrantPlugins
       name "Red Hat Enterprise Linux guest"
       description "Red Hat Enterprise Linux guest support."
 
-      guest("redhat", "linux") do
+      guest(:redhat, :linux) do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("redhat", "change_host_name") do
+      guest_capability(:redhat, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("redhat", "configure_networks") do
+      guest_capability(:redhat, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("redhat", "flavor") do
+      guest_capability(:redhat, :flavor) do
         require_relative "cap/flavor"
         Cap::Flavor
       end
 
-      guest_capability("redhat", "network_scripts_dir") do
+      guest_capability(:redhat, :network_scripts_dir) do
         require_relative "cap/network_scripts_dir"
         Cap::NetworkScriptsDir
       end
 
-      guest_capability("redhat", "nfs_client_install") do
+      guest_capability(:redhat, :nfs_client_install) do
         require_relative "cap/nfs_client"
         Cap::NFSClient
       end
 
-      guest_capability("redhat", "rsync_install") do
+      guest_capability(:redhat, :rsync_install) do
         require_relative "cap/rsync"
         Cap::RSync
       end

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

@@ -5,7 +5,7 @@ module VagrantPlugins
         def self.change_host_name(machine, name)
           comm = machine.communicate
 
-          if !comm.test("hostname -f | grep -w '#{name}'", sudo: false)
+          if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
             basename = name.split(".", 2)[0]
             comm.sudo <<-EOH.gsub(/^ {14}/, '')
               # Set the hostname

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

@@ -12,11 +12,7 @@ module VagrantPlugins
           comm = machine.communicate
 
           commands   = []
-          interfaces = []
-
-          comm.sudo("ip -o -0 addr | grep -v LOOPBACK | awk '{print $2}' | sed 's/://'") do |_, result|
-            interfaces = result.split("\n")
-          end
+          interfaces = machine.guest.capability(:network_interfaces)
 
           # Remove any previous configuration
           commands << "sed -i'' -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' /etc/rc.d/rc.inet1.conf"

data/plugins/guests/slackware/plugin.rb

@@ -6,17 +6,17 @@ module VagrantPlugins
       name "Slackware guest"
       description "Slackware guest support."
 
-      guest("slackware", "linux") do
+      guest(:slackware, :linux) do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("slackware", "change_host_name") do
+      guest_capability(:slackware, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("slackware", "configure_networks") do
+      guest_capability(:slackware, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end

data/plugins/guests/smartos/plugin.rb

@@ -6,52 +6,52 @@ module VagrantPlugins
       name "SmartOS guest."
       description "SmartOS guest support."
 
-      config("smartos") do
-        require File.expand_path("../config", __FILE__)
+      config(:smartos) do
+        require_relative "config"
         Config
       end
 
-      guest("smartos")  do
-        require File.expand_path("../guest", __FILE__)
+      guest(:smartos)  do
+        require_relative "guest"
         Guest
       end
 
-      guest_capability("smartos", "change_host_name") do
+      guest_capability(:smartos, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("smartos", "configure_networks") do
+      guest_capability(:smartos, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("smartos", "halt") do
+      guest_capability(:smartos, :halt) do
         require_relative "cap/halt"
         Cap::Halt
       end
 
-      guest_capability("smartos", "mount_nfs_folder") do
+      guest_capability(:smartos, :mount_nfs_folder) do
         require_relative "cap/mount_nfs"
         Cap::MountNFS
       end
 
-      guest_capability("smartos", "rsync_installed") do
+      guest_capability(:smartos, :rsync_installed) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("smartos", "rsync_command") do
+      guest_capability(:smartos, :rsync_command) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("smartos", "rsync_post") do
+      guest_capability(:smartos, :rsync_post) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("smartos", "rsync_pre") do
+      guest_capability(:smartos, :rsync_pre) do
         require_relative "cap/rsync"
         Cap::RSync
       end

data/plugins/guests/solaris/plugin.rb

@@ -6,62 +6,62 @@ module VagrantPlugins
       name "Solaris guest."
       description "Solaris guest support."
 
-      config("solaris") do
-        require File.expand_path("../config", __FILE__)
+      config(:solaris) do
+        require_relative "config"
         Config
       end
 
-      guest("solaris")  do
-        require File.expand_path("../guest", __FILE__)
+      guest(:solaris)  do
+        require_relative "guest"
         Guest
       end
 
-      guest_capability("solaris", "change_host_name") do
+      guest_capability(:solaris, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("solaris", "configure_networks") do
+      guest_capability(:solaris, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("solaris", "insert_public_key") do
+      guest_capability(:solaris, :insert_public_key) do
         require_relative "cap/insert_public_key"
         Cap::InsertPublicKey
       end
 
-      guest_capability("solaris", "halt") do
+      guest_capability(:solaris, :halt) do
         require_relative "cap/halt"
         Cap::Halt
       end
 
-      guest_capability("solaris", "mount_virtualbox_shared_folder") do
+      guest_capability(:solaris, :mount_virtualbox_shared_folder) do
         require_relative "cap/mount_virtualbox_shared_folder"
         Cap::MountVirtualBoxSharedFolder
       end
 
-      guest_capability("solaris", "remove_public_key") do
+      guest_capability(:solaris, :remove_public_key) do
         require_relative "cap/remove_public_key"
         Cap::RemovePublicKey
       end
 
-      guest_capability("solaris", "rsync_installed") do
+      guest_capability(:solaris, :rsync_installed) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("solaris", "rsync_command") do
+      guest_capability(:solaris, :rsync_command) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("solaris", "rsync_post") do
+      guest_capability(:solaris, :rsync_post) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("solaris", "rsync_pre") do
+      guest_capability(:solaris, :rsync_pre) do
         require_relative "cap/rsync"
         Cap::RSync
       end

data/plugins/guests/solaris11/plugin.rb

@@ -10,52 +10,52 @@ module VagrantPlugins
       name "Solaris 11 guest."
       description "Solaris 11 guest support."
 
-      config("solaris11") do
-        require File.expand_path("../config", __FILE__)
+      config(:solaris11) do
+        require_relative "config"
         Config
       end
 
-      guest("solaris11")  do
-        require File.expand_path("../guest", __FILE__)
+      guest(:solaris11) do
+        require_relative "guest"
         Guest
       end
 
-      guest_capability("solaris11", "change_host_name") do
+      guest_capability(:solaris11, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("solaris11", "configure_networks") do
+      guest_capability(:solaris11, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("solaris11", "halt") do
+      guest_capability(:solaris11, :halt) do
         require_relative "cap/halt"
         Cap::Halt
       end
 
-      guest_capability("solaris11", "mount_virtualbox_shared_folder") do
+      guest_capability(:solaris11, :mount_virtualbox_shared_folder) do
         require_relative "cap/mount_virtualbox_shared_folder"
         Cap::MountVirtualBoxSharedFolder
       end
 
-      guest_capability("solaris11", "rsync_installed") do
+      guest_capability(:solaris11, :rsync_installed) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("solaris11", "rsync_pre") do
+      guest_capability(:solaris11, :rsync_pre) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("solaris11", "insert_public_key") do
+      guest_capability(:solaris11, :insert_public_key) do
         require_relative "cap/insert_public_key"
         Cap::InsertPublicKey
       end
 
-      guest_capability("solaris11", "remove_public_key") do
+      guest_capability(:solaris11, :remove_public_key) do
         require_relative "cap/remove_public_key"
         Cap::RemovePublicKey
       end

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

@@ -5,7 +5,7 @@ module VagrantPlugins
         def self.change_host_name(machine, name)
           comm = machine.communicate
 
-          if !comm.test("hostname -f | grep -w '#{name}'", sudo: false)
+          if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
             basename = name.split(".", 2)[0]
             comm.sudo <<-EOH.gsub(/^ {14}/, '')
               echo '#{name}' > /etc/HOSTNAME

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

@@ -15,11 +15,7 @@ module VagrantPlugins
           network_scripts_dir = machine.guest.capability(:network_scripts_dir)
 
           commands   = []
-          interfaces = []
-
-          comm.sudo("ip -o -0 addr | grep -v LOOPBACK | awk '{print $2}' | sed 's/://'") do |_, stdout|
-            interfaces = stdout.split("\n")
-          end
+          interfaces = machine.guest.capability(:network_interfaces)
 
           networks.each.with_index do |network, i|
             network[:device] = interfaces[network[:interface]]

data/plugins/guests/suse/plugin.rb

@@ -6,42 +6,42 @@ module VagrantPlugins
       name "SUSE guest"
       description "SUSE guest support."
 
-      guest("suse", "linux") do
+      guest(:suse, :linux) do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("suse", "change_host_name") do
+      guest_capability(:suse, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("suse", "configure_networks") do
+      guest_capability(:suse, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("suse", "halt") do
+      guest_capability(:suse, :halt) do
         require_relative "cap/halt"
         Cap::Halt
       end
 
-      guest_capability("suse", "network_scripts_dir") do
+      guest_capability(:suse, :network_scripts_dir) do
         require_relative "cap/network_scripts_dir"
         Cap::NetworkScriptsDir
       end
 
-      guest_capability("suse", "nfs_client_install") do
+      guest_capability(:suse, :nfs_client_install) do
         require_relative "cap/nfs_client"
         Cap::NFSClient
       end
 
-      guest_capability("suse", "rsync_install") do
+      guest_capability(:suse, :rsync_install) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("suse", "rsync_installed") do
+      guest_capability(:suse, :rsync_installed) do
         require_relative "cap/rsync"
         Cap::RSync
       end

data/plugins/guests/tinycore/cap/mount_nfs.rb

@@ -27,9 +27,9 @@ module VagrantPlugins
             end
 
             mount_command = "mount.nfs -o '#{mount_opts.join(",")}' #{ip}:'#{hostpath}' #{expanded_guest_path}"
-            retryable(on: Vagrant::Errors::LinuxNFSMountFailed, tries: 8, sleep: 3) do
+            retryable(on: Vagrant::Errors::NFSMountFailed, tries: 8, sleep: 3) do
               machine.communicate.sudo(mount_command,
-                                       error_class: Vagrant::Errors::LinuxNFSMountFailed)
+                                       error_class: Vagrant::Errors::NFSMountFailed)
             end
 
             # Emit an upstart event if we can