vagrant-unbundled 1.8.1.2 → 1.8.4.1

data/plugins/guests/redhat/guest.rb

@@ -1,5 +1,3 @@
-require "vagrant"
-
 module VagrantPlugins
   module GuestRedHat
     class Guest < Vagrant.plugin("2", :guest)

data/plugins/guests/redhat/plugin.rb

@@ -7,7 +7,7 @@ module VagrantPlugins
       description "Red Hat Enterprise Linux guest support."
 
       guest("redhat", "linux") do
-        require File.expand_path("../guest", __FILE__)
+        require_relative "guest"
         Guest
       end
 
@@ -36,19 +36,10 @@ module VagrantPlugins
         Cap::NFSClient
       end
 
-      guest_capability("redhat", "nfs_client_installed") do
-        require_relative "cap/nfs_client"
-        Cap::NFSClient
-      end
-
       guest_capability("redhat", "rsync_install") do
         require_relative "cap/rsync"
         Cap::RSync
       end
-
-      def self.dnf?(machine)
-        machine.communicate.test("/usr/bin/which -s dnf")
-      end
     end
   end
 end

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

@@ -3,14 +3,25 @@ module VagrantPlugins
     module Cap
       class ChangeHostName
         def self.change_host_name(machine, name)
-          machine.communicate.tap do |comm|
-            # Only do this if the hostname is not already set
-            if !comm.test("sudo hostname | grep '#{name}'")
-              comm.sudo("chmod o+w /etc/hostname")
-              comm.sudo("echo #{name} > /etc/hostname")
-              comm.sudo("chmod o-w /etc/hostname")
-              comm.sudo("hostname -F /etc/hostname")
-            end
+          comm = machine.communicate
+
+          if !comm.test("hostname -f | grep -w '#{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
+
+              # Remove comments and blank lines from /etc/hosts
+              sed -i'' -e 's/#.*$//' -e '/^$/d' /etc/hosts
+
+              # 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
         end
       end

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

@@ -1,7 +1,6 @@
-# -*- coding: utf-8 -*-
 require "tempfile"
 
-require "vagrant/util/template_renderer"
+require_relative "../../../../lib/vagrant/util/template_renderer"
 
 module VagrantPlugins
   module GuestSlackware
@@ -10,25 +9,42 @@ module VagrantPlugins
         include Vagrant::Util
 
         def self.configure_networks(machine, networks)
-          interfaces = Array.new
-          machine.communicate.sudo("ip -o -0 addr | grep -v LOOPBACK | awk '{print $2}' | sed 's/://'") do |_, result|
+          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
 
-          networks.each do |network|
+          # Remove any previous configuration
+          commands << "sed -i'' -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' /etc/rc.d/rc.inet1.conf"
+
+          networks.each.with_index do |network, i|
             network[:device] = interfaces[network[:interface]]
 
-            entry = TemplateRenderer.render("guests/slackware/network_#{network[:type]}", options: network)
+            entry = TemplateRenderer.render("guests/slackware/network_#{network[:type]}",
+              i: i+1,
+              options: network,
+            )
+
+            remote_path = "/tmp/vagrant-network-#{network[:device]}-#{Time.now}-#{i}"
+            Tempfile.open("vagrant-slackware-configure-networks") do |f|
+              f.binmode
+              f.write(entry)
+              f.fsync
+              f.close
+              comm.upload(f.path, remote_path)
+            end
+
+            commands << "cat '#{remote_path}' >> /etc/rc.d/rc.inet1.conf"
+          end
 
-            temp = Tempfile.new("vagrant")
-            temp.binmode
-            temp.write(entry)
-            temp.close
+          # Restart networking
+          commands << "/etc/rc.d/rc.inet1"
 
-            machine.communicate.upload(temp.path, "/tmp/vagrant_network")
-            machine.communicate.sudo("mv /tmp/vagrant_network /etc/rc.d/rc.inet1.conf")
-            machine.communicate.sudo("/etc/rc.d/rc.inet1")
-          end 
+          comm.sudo(commands.join("\n"))
         end
       end
     end

data/plugins/guests/slackware/guest.rb

@@ -1,5 +1,3 @@
-require "vagrant"
-
 module VagrantPlugins
   module GuestSlackware
     class Guest < Vagrant.plugin("2", :guest)

data/plugins/guests/slackware/plugin.rb

@@ -7,7 +7,7 @@ module VagrantPlugins
       description "Slackware guest support."
 
       guest("slackware", "linux") do
-        require File.expand_path("../guest", __FILE__)
+        require_relative "guest"
         Guest
       end
 

data/plugins/guests/smartos/config.rb

@@ -1,26 +1,14 @@
 module VagrantPlugins
   module GuestSmartos
     class Config < Vagrant.plugin("2", :config)
-      attr_accessor :halt_timeout
-      attr_accessor :halt_check_interval
-      # This sets the command to use to execute items as a superuser. sudo is default
+      # This sets the command to use to execute items as a superuser.
+      # @default sudo
       attr_accessor :suexec_cmd
       attr_accessor :device
 
       def initialize
-        @halt_timeout = UNSET_VALUE
-        @halt_check_interval = UNSET_VALUE
         @suexec_cmd = 'pfexec'
-        @device = "e1000g"
-      end
-
-      def finalize!
-        if @halt_timeout != UNSET_VALUE
-          puts "smartos.halt_timeout is deprecated and will be removed in Vagrant 1.7"
-        end
-        if @halt_check_interval != UNSET_VALUE
-          puts "smartos.halt_check_interval is deprecated and will be removed in Vagrant 1.7"
-        end
+        @device     = "e1000g"
       end
     end
   end

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

@@ -3,14 +3,22 @@ module VagrantPlugins
     module Cap
       class ChangeHostName
         def self.change_host_name(machine, name)
-          machine.communicate.tap do |comm|
-            # Only do this if the hostname is not already set
-            if !comm.test("sudo hostname | grep '#{name}'")
-              comm.sudo("echo #{name} > /etc/HOSTNAME")
-              comm.sudo("hostname #{name}")
+          comm = machine.communicate
 
-              comm.sudo("sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} #{name.split('.')[0]} @' /etc/hosts")
-            end
+          if !comm.test("hostname -f | grep -w '#{name}'", sudo: false)
+            basename = name.split(".", 2)[0]
+            comm.sudo <<-EOH.gsub(/^ {14}/, '')
+              echo '#{name}' > /etc/HOSTNAME
+              hostname '#{name}'
+
+              # Remove comments and blank lines from /etc/hosts
+              sed -i'' -e 's/#.*$//' -e '/^$/d' /etc/hosts
+
+              # 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
         end
       end

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

@@ -1,8 +1,6 @@
-require "set"
 require "tempfile"
 
-require "vagrant/util/retryable"
-require "vagrant/util/template_renderer"
+require_relative "../../../../lib/vagrant/util/template_renderer"
 
 module VagrantPlugins
   module GuestSUSE
@@ -12,47 +10,43 @@ module VagrantPlugins
         include Vagrant::Util
 
         def self.configure_networks(machine, networks)
-          network_scripts_dir = machine.guest.capability("network_scripts_dir")
-
-          # Accumulate the configurations to add to the interfaces file as
-          # well as what interfaces we're actually configuring since we use that
-          # later.
-          interfaces = Set.new
-          networks.each do |network|
-            interfaces.add(network[:interface])
-
-            # Remove any previous vagrant configuration in this network interface's
-            # configuration files.
-            machine.communicate.sudo("touch #{network_scripts_dir}/ifcfg-eth#{network[:interface]}")
-            machine.communicate.sudo("sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' #{network_scripts_dir}/ifcfg-eth#{network[:interface]} > /tmp/vagrant-ifcfg-eth#{network[:interface]}")
-            machine.communicate.sudo("cat /tmp/vagrant-ifcfg-eth#{network[:interface]} > #{network_scripts_dir}/ifcfg-eth#{network[:interface]}")
-            machine.communicate.sudo("rm -f /tmp/vagrant-ifcfg-eth#{network[:interface]}")
-
-            # Render and upload the network entry file to a deterministic
-            # temporary location.
-            entry = TemplateRenderer.render("guests/suse/network_#{network[:type]}",
-                                            options: network)
+          comm = machine.communicate
+
+          network_scripts_dir = machine.guest.capability(:network_scripts_dir)
 
-            temp = Tempfile.new("vagrant")
-            temp.binmode
-            temp.write(entry)
-            temp.close
+          commands   = []
+          interfaces = []
 
-            machine.communicate.upload(temp.path, "/tmp/vagrant-network-entry_#{network[:interface]}")
+          comm.sudo("ip -o -0 addr | grep -v LOOPBACK | awk '{print $2}' | sed 's/://'") do |_, stdout|
+            interfaces = stdout.split("\n")
           end
 
-          # Bring down all the interfaces we're reconfiguring. By bringing down
-          # each specifically, we avoid reconfiguring eth0 (the NAT interface) so
-          # SSH never dies.
-          interfaces.each do |interface|
-            retryable(on: Vagrant::Errors::VagrantError, tries: 3, sleep: 2) do
-              machine.communicate.sudo("/sbin/ifdown eth#{interface} 2> /dev/null", error_check: false)
-              machine.communicate.sudo("cat /tmp/vagrant-network-entry_#{interface} >> #{network_scripts_dir}/ifcfg-eth#{interface}")
-              machine.communicate.sudo("/sbin/ifup eth#{interface} 2> /dev/null")
+          networks.each.with_index do |network, i|
+            network[:device] = interfaces[network[:interface]]
+
+            entry = TemplateRenderer.render("guests/suse/network_#{network[:type]}",
+              options: network,
+            )
+
+            remote_path = "/tmp/vagrant-network-#{network[:device]}-#{Time.now.to_i}-#{i}"
+
+            Tempfile.open("vagrant-suse-configure-networks") do |f|
+              f.binmode
+              f.write(entry)
+              f.fsync
+              f.close
+              comm.upload(f.path, remote_path)
             end
 
-            machine.communicate.sudo("rm -f /tmp/vagrant-network-entry_#{interface}")
+            local_path = "#{network_scripts_dir}/ifcfg-#{network[:device]}"
+            commands << <<-EOH.gsub(/^ {14}/, '')
+              /sbin/ifdown '#{network[:device]}' || true
+              mv '#{remote_path}' '#{local_path}'
+              /sbin/ifup '#{network[:device]}'
+            EOH
           end
+
+          comm.sudo(commands.join("\n"))
         end
       end
     end

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

@@ -3,12 +3,11 @@ module VagrantPlugins
     module Cap
       class NFSClient
         def self.nfs_client_install(machine)
-          machine.communicate.tap do |comm|
-            comm.sudo("zypper -n install nfs-client")
-
-            comm.sudo("/sbin/service rpcbind restart")
-            comm.sudo("/sbin/service nfs restart")
-          end
+          machine.communicate.sudo <<-EOH.gsub(/^ {12}/, '')
+            zypper -n install nfs-client
+            /sbin/service rpcbind restart
+            /sbin/service nfs restart
+          EOH
         end
       end
     end

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

@@ -7,9 +7,7 @@ module VagrantPlugins
         end
 
         def self.rsync_install(machine)
-          machine.communicate.tap do |comm|
-            comm.sudo("zypper -n install rsync")
-          end
+          machine.communicate.sudo("zypper -n install rsync")
         end
       end
     end

data/plugins/guests/suse/guest.rb

@@ -1,5 +1,3 @@
-require "vagrant"
-
 module VagrantPlugins
   module GuestSUSE
     class Guest < Vagrant.plugin("2", :guest)

data/plugins/guests/suse/plugin.rb

@@ -7,7 +7,7 @@ module VagrantPlugins
       description "SUSE guest support."
 
       guest("suse", "linux") do
-        require File.expand_path("../guest", __FILE__)
+        require_relative "guest"
         Guest
       end
 

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

@@ -0,0 +1,46 @@
+require "vagrant/util/retryable"
+
+module VagrantPlugins
+  module GuestTinyCore
+    module Cap
+      class MountNFS
+        extend Vagrant::Util::Retryable
+
+        def self.mount_nfs_folder(machine, ip, folders)
+          folders.each do |name, opts|
+            # Expand the guest path so we can handle things like "~/vagrant"
+            expanded_guest_path = machine.guest.capability(
+              :shell_expand_guest_path, opts[:guestpath])
+
+            # Do the actual creating and mounting
+            machine.communicate.sudo("mkdir -p #{expanded_guest_path}")
+
+            # Mount
+            hostpath = opts[:hostpath].dup
+            hostpath.gsub!("'", "'\\\\''")
+
+            # Figure out any options
+            mount_opts = ["vers=#{opts[:nfs_version]}"]
+            mount_opts << "udp" if opts[:nfs_udp]
+            if opts[:mount_options]
+              mount_opts = opts[:mount_options].dup
+            end
+
+            mount_command = "mount.nfs -o '#{mount_opts.join(",")}' #{ip}:'#{hostpath}' #{expanded_guest_path}"
+            retryable(on: Vagrant::Errors::LinuxNFSMountFailed, tries: 8, sleep: 3) do
+              machine.communicate.sudo(mount_command,
+                                       error_class: Vagrant::Errors::LinuxNFSMountFailed)
+            end
+
+            # Emit an upstart event if we can
+            machine.communicate.sudo <<-SCRIPT
+if command -v /sbin/init && /sbin/init --version | grep upstart; then
+  /sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT='#{expanded_guest_path}'
+fi
+SCRIPT
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/guests/tinycore/plugin.rb

@@ -30,6 +30,11 @@ module VagrantPlugins
         require_relative "cap/rsync"
         Cap::RSync
       end
+
+      guest_capability("tinycore", "mount_nfs_folder") do
+        require_relative "cap/mount_nfs"
+        Cap::MountNFS
+      end
     end
   end
 end

data/plugins/guests/trisquel/guest.rb

@@ -0,0 +1,9 @@
+module VagrantPlugins
+  module GuestTrisquel
+    class Guest < Vagrant.plugin("2", :guest)
+      def detect?(machine)
+        machine.communicate.test("[ -x /usr/bin/lsb_release ] && /usr/bin/lsb_release -i 2>/dev/null | grep Trisquel")
+      end
+    end
+  end
+end

data/plugins/guests/trisquel/plugin.rb

@@ -0,0 +1,15 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestTrisquel
+    class Plugin < Vagrant.plugin("2")
+      name "Trisquel guest"
+      description "Trisquel guest support."
+
+      guest("trisquel", "ubuntu") do
+        require_relative "guest"
+        Guest
+      end
+    end
+  end
+end

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

@@ -1,50 +1,51 @@
 module VagrantPlugins
   module GuestUbuntu
     module Cap
-      class ChangeHostName < VagrantPlugins::GuestDebian::Cap::ChangeHostName
+      class ChangeHostName
         def self.change_host_name(machine, name)
-          super
-        end
-
-        def update_etc_hostname
-          return super unless systemd?
-          sudo("hostnamectl set-hostname '#{short_hostname}'")
-        end
-
-        def refresh_hostname_service
-          if hardy?
-            # hostname.sh returns 1, so use `true` to get a 0 exitcode
-            sudo("/etc/init.d/hostname.sh start; true")
-          elsif systemd?
-            # Service runs via hostnamectl
-          else
-            sudo("service hostname start")
-          end
-        end
-
-        def hardy?
-          os_version("hardy")
-        end
-
-        def renew_dhcp
-          sudo("ifdown -a; ifup -a; ifup -a --allow=hotplug")
-        end
-
-      private
-
-        def init_package
-          machine.communicate.execute('cat /proc/1/comm') do |type, data|
-            return data.chomp if type == :stdout
+          comm = machine.communicate
+
+          if !comm.test("hostname -f | grep -w '#{name}'")
+            basename = name.split(".", 2)[0]
+            comm.sudo <<-EOH.gsub(/^ {14}/, '')
+              # Set the hostname
+              echo '#{name}' > /etc/hostname
+              hostname -F /etc/hostname
+
+              if command -v hostnamectl; then
+                hostnamectl set-hostname '#{name}'
+              fi
+
+              # Remove comments and blank lines from /etc/hosts
+              sed -i'' -e 's/#.*$//' -e '/^$/d' /etc/hosts
+
+              # Prepend ourselves to /etc/hosts
+              grep -w '#{name}' /etc/hosts || {
+                sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
+              }
+
+              # Update mailname
+              echo '#{name}' > /etc/mailname
+
+              # Restart networking and force new DHCP
+              if [ test -f /etc/init.d/hostname ]; then
+                /etc/init.d/hostname start || true
+              fi
+
+              if [ test -f /etc/init.d/hostname.sh ]; then
+                /etc/init.d/hostname.sh start || true
+              fi
+
+              if [ test -f /etc/init.d/networking ]; then
+                /etc/init.d/networking force-reload
+              fi
+
+              if [ test -f /etc/init.d/network-manager ]; then
+                /etc/init.d/network-manager force-reload
+              fi
+            EOH
           end
         end
-
-        def os_version(name)
-          machine.communicate.test("[ `lsb_release -c -s` = #{name} ]")
-        end
-
-        def systemd?
-          init_package == 'systemd'
-        end
       end
     end
   end