tnargav 1.2.3 → 1.3.3

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

@@ -0,0 +1,16 @@
+module VagrantPlugins
+  module GuestDarwin
+    module Cap
+      class Halt
+        def self.halt(machine)
+          begin
+            machine.communicate.sudo("shutdown -h now")
+          rescue IOError
+            # Do nothing because SSH connection closed and it probably
+            # means the VM just shut down really fast.
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+require "vagrant/util/retryable"
+
+module VagrantPlugins
+  module GuestDarwin
+    module Cap
+      class MountNFSFolder
+        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])
+
+              machine.communicate.sudo("if [ ! -d  #{expanded_guest_path} ]; then  mkdir -p #{expanded_guest_path};fi")
+
+              mount_command = "mount -t nfs '#{ip}:#{opts[:hostpath]}' '#{expanded_guest_path}'"
+              retryable(:on => Vagrant::Errors::DarwinNFSMountFailed, :tries => 10, :sleep => 5) do
+                machine.communicate.sudo(mount_command, :error_class => Vagrant::Errors::DarwinNFSMountFailed)
+              end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module VagrantPlugins
+  module GuestDarwin
+    module Cap
+      class MountVmwareSharedFolder
+
+        # we seem to be unable to ask 'mount -t vmhgfs' to mount the roots
+        # of specific shares, so instead we symlink from what is already
+        # mounted by the guest tools 
+        # (ie. the behaviour of the VMware_fusion provider prior to 0.8.x)
+
+        def self.mount_vmware_shared_folder(machine, name, guestpath, options)
+          machine.communicate.tap do |comm|
+            # clear prior symlink
+            if comm.test("test -L \"#{guestpath}\"", :sudo => true)
+              comm.sudo("rm \"#{guestpath}\"")
+            end
+
+            # clear prior directory if exists
+            if comm.test("test -d \"#{guestpath}\"", :sudo => true)
+              comm.sudo("rm -Rf \"#{guestpath}\"")
+            end
+
+            # create intermediate directories if needed
+            intermediate_dir = File.dirname(guestpath)
+            if !comm.test("test -d \"#{intermediate_dir}\"", :sudo => true)
+              comm.sudo("mkdir -p \"#{intermediate_dir}\"")
+            end
+
+            # finally make the symlink
+            comm.sudo("ln -s \"/Volumes/VMware Shared Folders/#{name}\" \"#{guestpath}\"")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module VagrantPlugins
+  module GuestDarwin
+    module Cap
+      class ShellExpandGuestPath
+        def self.shell_expand_guest_path(machine, path)
+          real_path = nil
+          machine.communicate.execute("printf #{path}") do |type, data|
+            if type == :stdout
+              real_path ||= ""
+              real_path += data
+            end
+          end
+
+          if !real_path
+            # If no real guest path was detected, this is really strange
+            # and we raise an exception because this is a bug.
+            raise DarwinShellExpandFailed
+          end
+
+          # Chomp the string so that any trailing newlines are killed
+          return real_path.chomp
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module VagrantPlugins
+  module GuestDarwin
+    module Cap
+      class VerifyVmwareHgfs
+        def self.verify_vmware_hgfs(machine)
+          kext_bundle_id = "com.vmware.kext.vmhgfs"
+          machine.communicate.test("kextstat -b #{kext_bundle_id} -l | grep #{kext_bundle_id}")
+        end
+      end
+    end
+  end
+end

data/plugins/guests/darwin/guest.rb

@@ -0,0 +1,15 @@
+require 'vagrant/util/template_renderer'
+
+module VagrantPlugins
+  module GuestDarwin
+    # A general Vagrant system implementation for OS X (ie. "Darwin").
+    #
+    # Contributed by: - Brian Johnson <b2jrock@gmail.com>
+    #                 - Tim Sutton <tim@synthist.net>
+    class Guest < Vagrant.plugin("2", :guest)
+      def detect?(machine)
+        machine.communicate.test("uname -s | grep 'Darwin'")
+      end
+    end
+  end
+end

data/plugins/guests/darwin/plugin.rb

@@ -0,0 +1,50 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestDarwin
+    class Plugin < Vagrant.plugin("2")
+      name "Darwin guest"
+      description "Darwin guest support."
+
+      guest("darwin")  do
+        require File.expand_path("../guest", __FILE__)
+        Guest
+      end
+
+      guest_capability("darwin", "change_host_name") do
+        require_relative "cap/change_host_name"
+        Cap::ChangeHostName
+      end
+
+      guest_capability("darwin", "configure_networks") do
+        require_relative "cap/configure_networks"
+        Cap::ConfigureNetworks
+      end
+
+      guest_capability("darwin", "halt") do
+        require_relative "cap/halt"
+        Cap::Halt
+      end
+
+      guest_capability("darwin", "mount_nfs_folder") do
+        require_relative "cap/mount_nfs_folder"
+        Cap::MountNFSFolder
+      end
+
+      guest_capability("darwin", "mount_vmware_shared_folder") do
+        require_relative "cap/mount_vmware_shared_folder"
+        Cap::MountVmwareSharedFolder
+      end
+
+      guest_capability("darwin", "shell_expand_guest_path") do
+        require_relative "cap/shell_expand_guest_path"
+        Cap::ShellExpandGuestPath
+      end
+
+      guest_capability("darwin", "verify_vmware_hgfs") do
+        require_relative "cap/verify_vmware_hgfs"
+        Cap::VerifyVmwareHgfs
+      end
+    end
+  end
+end

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

@@ -9,6 +9,7 @@ module VagrantPlugins
               comm.sudo("sed -i 's/.*$/#{name.split('.')[0]}/' /etc/hostname")
               comm.sudo("hostname -F /etc/hostname")
               comm.sudo("hostname --fqdn > /etc/mailname")
+              comm.sudo("ifdown -a; ifup -a; ifup eth0")
             end
           end
         end

data/plugins/guests/gentoo/guest.rb

@@ -2,7 +2,7 @@ module VagrantPlugins
   module GuestGentoo
     class Guest < Vagrant.plugin("2", :guest)
       def detect?(machine)
-        machine.communicate.test("cat /etc/gentoo-release")
+        machine.communicate.test("grep Gentoo /etc/gentoo-release")
       end
     end
   end

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

@@ -16,8 +16,16 @@ module VagrantPlugins
             machine.communicate.sudo("mkdir -p #{expanded_guest_path}")
 
             # Mount
-            mount_command = "mount -o vers=#{opts[:nfs_version]} #{ip}:'#{opts[:hostpath]}' #{expanded_guest_path}"
+            hostpath = opts[:hostpath].dup
+            hostpath.gsub!("'", "'\\\\''")
 
+            # Figure out any options
+            mount_opts = ["vers=#{opts[:nfs_version]}", "udp"]
+            if opts[:mount_options]
+              mount_opts = opts[:mount_options].dup
+            end
+
+            mount_command = "mount -o '#{mount_opts.join(",")}' #{ip}:'#{hostpath}' #{expanded_guest_path}"
             retryable(:on => Vagrant::Errors::LinuxNFSMountFailed, :tries => 5, :sleep => 2) do
               machine.communicate.sudo(mount_command,
                                        :error_class => Vagrant::Errors::LinuxNFSMountFailed)

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

@@ -6,10 +6,17 @@ module VagrantPlugins
           expanded_guest_path = machine.guest.capability(
             :shell_expand_guest_path, guestpath)
 
-          # Determine the permission string to attach to the mount command
+          mount_commands = []
+
+          # First mount command uses getent to get the group
+          mount_options = "-o uid=`id -u #{options[:owner]}`,gid=`getent group #{options[:group]} | cut -d: -f3`"
+          mount_options += ",#{options[:mount_options].join(",")}" if options[:mount_options]
+          mount_commands << "mount -t vboxsf #{mount_options} #{name} #{expanded_guest_path}"
+
+          # Second mount command uses the old style `id -g`
           mount_options = "-o uid=`id -u #{options[:owner]}`,gid=`id -g #{options[:group]}`"
-          mount_options += ",#{options[:extra]}" if options[:extra]
-          mount_command = "mount -t vboxsf #{mount_options} #{name} #{expanded_guest_path}"
+          mount_options += ",#{options[:mount_options].join(",")}" if options[:mount_options]
+          mount_commands << "mount -t vboxsf #{mount_options} #{name} #{expanded_guest_path}"
 
           # Create the guest path if it doesn't exist
           machine.communicate.sudo("mkdir -p #{expanded_guest_path}")
@@ -19,8 +26,13 @@ module VagrantPlugins
           attempts = 0
           while true
             success = true
-            machine.communicate.sudo(mount_command) do |type, data|
-              success = false if type == :stderr && data =~ /No such device/i
+
+            mount_commands.each do |command|
+              machine.communicate.sudo(command) do |type, data|
+                success = false if type == :stderr && data =~ /No such device/i
+              end
+
+              break if success
             end
 
             break if success
@@ -31,8 +43,15 @@ module VagrantPlugins
           end
 
           # Chown the directory to the proper user
-          machine.communicate.sudo(
-            "chown `id -u #{options[:owner]}`:`id -g #{options[:group]}` #{expanded_guest_path}")
+          chown_commands = []
+          chown_commands << "chown `id -u #{options[:owner]}`:`getent group #{options[:group]} " +
+            "| cut -d: -f3` #{expanded_guest_path}"
+          chown_commands << "chown `id -u #{options[:owner]}`:`id -g #{options[:group]} " +
+            "#{expanded_guest_path}"
+
+          exit_status = machine.communicate.sudo(chown_commands[0], error_check: false)
+          return if exit_status == 0
+          machine.communicate.sudo(chown_commands[1])
         end
       end
     end

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

@@ -4,13 +4,16 @@ module VagrantPlugins
       class ShellExpandGuestPath
         def self.shell_expand_guest_path(machine, path)
           real_path = nil
-          machine.communicate.execute("printf #{path}") do |type, data|
+          machine.communicate.execute("echo; printf #{path}") do |type, data|
             if type == :stdout
               real_path ||= ""
               real_path += data
             end
           end
 
+          # The last line is the path we care about
+          real_path = real_path.split("\n").last.chomp
+
           if !real_path
             # If no real guest path was detected, this is really strange
             # and we raise an exception because this is a bug.

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

@@ -0,0 +1,14 @@
+module VagrantPlugins
+  module GuestOpenBSD
+    module Cap
+      class ChangeHostName
+        def self.change_host_name(machine, name)
+          if !machine.communicate.test("hostname | grep '^#{name}$'")
+            machine.communicate.sudo("sh -c \"echo '#{name}' > /etc/myname\"")
+            machine.communicate.sudo("hostname #{name}")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+require "tempfile"
+
+require "vagrant/util/template_renderer"
+
+module VagrantPlugins
+  module GuestOpenBSD
+    module Cap
+      class ConfigureNetworks
+        include Vagrant::Util
+
+        def self.configure_networks(machine, networks)
+          networks.each do |network|
+            entry = TemplateRenderer.render("guests/openbsd/network_#{network[:type]}",
+                                            :options => network)
+
+            temp = Tempfile.new("vagrant")
+            temp.binmode
+            temp.write(entry)
+            temp.close
+
+            ifname = "em#{network[:interface]}"
+
+            machine.communicate.upload(temp.path, "/tmp/vagrant-network-entry")
+            machine.communicate.sudo("mv /tmp/vagrant-network-entry /etc/hostname.#{ifname}")
+
+            # remove old configurations
+            machine.communicate.sudo("sudo ifconfig #{ifname} inet delete", { :error_check => false })
+            machine.communicate.sudo("pkill -f 'dhclient: #{ifname}'", { :error_check => false })
+
+            if network[:type].to_sym == :static
+              machine.communicate.sudo("ifconfig #{ifname} inet #{network[:ip]} netmask #{network[:netmask]}")
+            elsif network[:type].to_sym == :dhcp
+              machine.communicate.sudo("dhclient #{ifname}")
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module VagrantPlugins
+  module GuestOpenBSD
+    module Cap
+      class MountNFSFolder
+        def self.mount_nfs_folder(machine, ip, folders)
+          folders.each do |name, opts|
+            machine.communicate.sudo("mkdir -p #{opts[:guestpath]}")
+            machine.communicate.sudo("mount '#{ip}:#{opts[:hostpath]}' '#{opts[:guestpath]}'")
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/guests/openbsd/plugin.rb

@@ -11,10 +11,25 @@ module VagrantPlugins
         Guest
       end
 
+      guest_capability("openbsd", "change_host_name") do
+        require_relative "cap/change_host_name"
+        Cap::ChangeHostName
+      end
+
+      guest_capability("openbsd", "configure_networks") do
+        require_relative "cap/configure_networks"
+        Cap::ConfigureNetworks
+      end
+
       guest_capability("openbsd", "halt") do
         require_relative "cap/halt"
         Cap::Halt
       end
+
+      guest_capability("openbsd", "mount_nfs_folder") do
+        require_relative "cap/mount_nfs_folder"
+        Cap::MountNFSFolder
+      end
     end
   end
 end

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

@@ -9,7 +9,8 @@ module VagrantPlugins
           #
           # does not exist in /etc/user_attr. TODO
           begin
-            machine.communicate.execute("#{machine.config.solaris.suexec_cmd} /usr/sbin/poweroff")
+            machine.communicate.execute(
+              "#{machine.config.solaris.suexec_cmd} /usr/sbin/shutdown -y -i5 -g0")
           rescue IOError
             # Ignore, this probably means connection closed because it
             # shut down.

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

@@ -16,7 +16,10 @@ module VagrantPlugins
 
           # Mount the folder with the proper owner/group
           mount_options = "-o uid=`#{id_cmd} -u #{owner}`,gid=`#{id_cmd} -g #{group}`"
-          mount_options += ",#{options[:extra]}" if options[:extra]
+          if options[:mount_options]
+            mount_options += ",#{options[:mount_options].join(",")}"
+          end
+
           machine.communicate.execute("#{machine.config.solaris.suexec_cmd} /sbin/mount -F vboxfs #{mount_options} #{name} #{guestpath}")
 
           # chown the folder to the proper owner/group

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

@@ -0,0 +1,25 @@
+# A general Vagrant system implementation for "solaris 11".
+#
+# Contributed by Jan Thomas Moldung <janth@moldung.no>
+
+module VagrantPlugins
+  module GuestSolaris11
+    module Cap
+      class ChangeHostName
+        def self.change_host_name(machine, name)
+          su_cmd = machine.config.solaris11.suexec_cmd
+
+          # Only do this if the hostname is not already set
+          if !machine.communicate.test("/usr/sbin/svccfg -s system/identity:node listprop config/nodename | /usr/bin/grep '#{name}'")
+            #machine.communicate.execute("#{su_cmd} sh -c \"echo '#{name}' > /etc/nodename\"")
+            #machine.communicate.execute("#{su_cmd} uname -S #{name}")
+            machine.communicate.execute("#{su_cmd} /usr/sbin/svccfg -s system/identity:node setprop config/nodename=\"#{name}\"")
+            machine.communicate.execute("#{su_cmd} /usr/sbin/svccfg -s system/identity:node setprop config/loopback=\"#{name}\"")
+            machine.communicate.execute("#{su_cmd} /usr/sbin/svccfg -s system/identity:node refresh ")
+            machine.communicate.execute("#{su_cmd} /usr/sbin/svcadm restart system/identity:node ")
+          end
+        end
+      end
+    end
+  end
+end