vagrantup 1.0.7 → 1.1.0

data/plugins/guests/linux/plugin.rb

@@ -0,0 +1,20 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestLinux
+    class Plugin < Vagrant.plugin("2")
+      name "Linux guest."
+      description "Linux guest support."
+
+      config("linux") do
+        require File.expand_path("../config", __FILE__)
+        Config
+      end
+
+      guest("linux")  do
+        require File.expand_path("../guest", __FILE__)
+        Guest
+      end
+    end
+  end
+end

data/plugins/guests/openbsd/guest.rb

@@ -0,0 +1,13 @@
+require "vagrant"
+
+require Vagrant.source_root.join("plugins/guests/linux/guest")
+
+module VagrantPlugins
+  module GuestOpenBSD
+    class Guest < VagrantPlugins::GuestLinux::Guest
+      def halt
+        vm.communicate.sudo("shutdown -p -h now")
+      end
+    end
+  end
+end

data/plugins/guests/openbsd/plugin.rb

@@ -0,0 +1,15 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestOpenBSD
+    class Plugin < Vagrant.plugin("2")
+      name "OpenBSD guest"
+      description "OpenBSD guest support."
+
+      guest("openbsd") do
+        require File.expand_path("../guest", __FILE__)
+        Guest
+      end
+    end
+  end
+end

data/{lib/vagrant/guest/redhat.rb → plugins/guests/redhat/guest.rb}

@@ -1,11 +1,14 @@
 require 'set'
 require 'tempfile'
 
+require "vagrant"
 require 'vagrant/util/template_renderer'
 
-module Vagrant
-  module Guest
-    class Redhat < Linux
+require Vagrant.source_root.join("plugins/guests/linux/guest")
+
+module VagrantPlugins
+  module GuestRedHat
+    class Guest < VagrantPlugins::GuestLinux::Guest
       # Make the TemplateRenderer top-level
       include Vagrant::Util
 
@@ -19,9 +22,10 @@ module Vagrant
 
           # Remove any previous vagrant configuration in this network interface's
           # configuration files.
-          vm.channel.sudo("touch #{network_scripts_dir}/ifcfg-eth#{network[:interface]}")
-          vm.channel.sudo("sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' #{network_scripts_dir}/ifcfg-eth#{network[:interface]} > /tmp/vagrant-ifcfg-eth#{network[:interface]}")
-          vm.channel.sudo("cat /tmp/vagrant-ifcfg-eth#{network[:interface]} > #{network_scripts_dir}/ifcfg-eth#{network[:interface]}")
+          vm.communicate.sudo("touch #{network_scripts_dir}/ifcfg-eth#{network[:interface]}")
+          vm.communicate.sudo("sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' #{network_scripts_dir}/ifcfg-eth#{network[:interface]} > /tmp/vagrant-ifcfg-eth#{network[:interface]}")
+          vm.communicate.sudo("cat /tmp/vagrant-ifcfg-eth#{network[:interface]} > #{network_scripts_dir}/ifcfg-eth#{network[:interface]}")
+          vm.communicate.sudo("rm /tmp/vagrant-ifcfg-eth#{network[:interface]}")
 
           # Render and upload the network entry file to a deterministic
           # temporary location.
@@ -33,16 +37,17 @@ module Vagrant
           temp.write(entry)
           temp.close
 
-          vm.channel.upload(temp.path, "/tmp/vagrant-network-entry_#{network[:interface]}")
+          vm.communicate.upload(temp.path, "/tmp/vagrant-network-entry_#{network[:interface]}")
         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|
-          vm.channel.sudo("/sbin/ifdown eth#{interface} 2> /dev/null", :error_check => false)
-          vm.channel.sudo("cat /tmp/vagrant-network-entry_#{interface} >> #{network_scripts_dir}/ifcfg-eth#{interface}")
-          vm.channel.sudo("/sbin/ifup eth#{interface} 2> /dev/null")
+          vm.communicate.sudo("/sbin/ifdown eth#{interface} 2> /dev/null", :error_check => false)
+          vm.communicate.sudo("cat /tmp/vagrant-network-entry_#{interface} >> #{network_scripts_dir}/ifcfg-eth#{interface}")
+          vm.communicate.sudo("rm /tmp/vagrant-network-entry_#{interface}")
+          vm.communicate.sudo("/sbin/ifup eth#{interface} 2> /dev/null")
         end
       end
 
@@ -55,11 +60,13 @@ module Vagrant
       end
 
       def change_host_name(name)
-        # Only do this if the hostname is not already set
-        if !vm.channel.test("sudo hostname | grep '#{name}'")
-          vm.channel.sudo("sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network")
-          vm.channel.sudo("hostname #{name}")
-          vm.channel.sudo("sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} #{name.split('.')[0]} @' /etc/hosts")
+        vm.communicate.tap do |comm|
+          # Only do this if the hostname is not already set
+          if !comm.test("sudo hostname | grep '#{name}'")
+            comm.sudo("sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network")
+            comm.sudo("hostname #{name}")
+            comm.sudo("sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} #{name.split('.')[0]} @' /etc/hosts")
+          end
         end
       end
     end

data/plugins/guests/redhat/plugin.rb

@@ -0,0 +1,15 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestRedHat
+    class Plugin < Vagrant.plugin("2")
+      name "RedHat guest"
+      description "RedHat guest support."
+
+      guest("redhat") do
+        require File.expand_path("../guest", __FILE__)
+        Guest
+      end
+    end
+  end
+end

data/plugins/guests/solaris/config.rb

@@ -0,0 +1,18 @@
+module VagrantPlugins
+  module GuestSolaris
+    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
+      attr_accessor :suexec_cmd
+      attr_accessor :device
+
+      def initialize
+        @halt_timeout = 30
+        @halt_check_interval = 1
+        @suexec_cmd = 'sudo'
+        @device = "e1000g"
+      end
+    end
+  end
+end

data/plugins/guests/solaris/guest.rb

@@ -0,0 +1,73 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestSolaris
+    # A general Vagrant system implementation for "solaris".
+    #
+    # Contributed by Blake Irvin <b.irvin@modcloth.com>
+    class Guest < Vagrant.plugin("2", :guest)
+      # Here for whenever it may be used.
+      class SolarisError < Vagrant::Errors::VagrantError
+        error_namespace("vagrant.guest.solaris")
+      end
+
+      def configure_networks(networks)
+        networks.each do |network|
+          device = "#{vm.config.solaris.device}#{network[:interface]}"
+          su_cmd = vm.config.solaris.suexec_cmd
+          ifconfig_cmd = "#{su_cmd} /sbin/ifconfig #{device}"
+
+          vm.communicate.execute("#{ifconfig_cmd} plumb")
+
+          if network[:type].to_sym == :static
+            vm.communicate.execute("#{ifconfig_cmd} inet #{network[:ip]} netmask #{network[:netmask]}")
+            vm.communicate.execute("#{ifconfig_cmd} up")
+            vm.communicate.execute("#{su_cmd} sh -c \"echo '#{network[:ip]}' > /etc/hostname.#{device}\"")
+          elsif network[:type].to_sym == :dhcp
+            vm.communicate.execute("#{ifconfig_cmd} dhcp start")
+          end
+        end
+      end
+
+      def change_host_name(name)
+        su_cmd = vm.config.solaris.suexec_cmd
+
+        # Only do this if the hostname is not already set
+        if !vm.communicate.test("#{su_cmd} hostname | grep '#{name}'")
+          vm.communicate.execute("#{su_cmd} sh -c \"echo '#{name}' > /etc/nodename\"")
+          vm.communicate.execute("#{su_cmd} uname -S #{name}")
+        end
+      end
+
+      # There should be an exception raised if the line
+      #
+      #     vagrant::::profiles=Primary Administrator
+      #
+      # does not exist in /etc/user_attr. TODO
+      def halt
+        vm.communicate.execute("#{vm.config.solaris.suexec_cmd} /usr/sbin/poweroff")
+      end
+
+      def mount_shared_folder(name, guestpath, options)
+        # These are just far easier to use than the full options syntax
+        owner = options[:owner]
+        group = options[:group]
+
+        # Create the shared folder
+        vm.communicate.execute("#{vm.config.solaris.suexec_cmd} mkdir -p #{guestpath}")
+
+        # We have to use this `id` command instead of `/usr/bin/id` since this
+        # one accepts the "-u" and "-g" flags.
+        id_cmd        = "/usr/xpg4/bin/id"
+
+        # 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]
+        vm.communicate.execute("#{vm.config.solaris.suexec_cmd} /sbin/mount -F vboxfs #{mount_options} #{name} #{guestpath}")
+
+        # chown the folder to the proper owner/group
+        vm.communicate.execute("#{vm.config.solaris.suexec_cmd} chown `#{id_cmd} -u #{owner}`:`#{id_cmd} -g #{group}` #{guestpath}")
+      end
+    end
+  end
+end

data/plugins/guests/solaris/plugin.rb

@@ -0,0 +1,20 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestSolaris
+    class Plugin < Vagrant.plugin("2")
+      name "Solaris guest."
+      description "Solaris guest support."
+
+      config("solaris") do
+        require File.expand_path("../config", __FILE__)
+        Config
+      end
+
+      guest("solaris")  do
+        require File.expand_path("../guest", __FILE__)
+        Guest
+      end
+    end
+  end
+end

data/plugins/guests/suse/guest.rb

@@ -0,0 +1,24 @@
+require "vagrant"
+
+require Vagrant.source_root.join("plugins/guests/redhat/guest")
+
+module VagrantPlugins
+  module GuestSuse
+    class Guest < VagrantPlugins::GuestRedHat::Guest
+      def network_scripts_dir
+        '/etc/sysconfig/network/'
+      end
+
+      def change_host_name(name)
+        vm.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.sudo("sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} #{name.split('.')[0]} @' /etc/hosts")
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/guests/suse/plugin.rb

@@ -0,0 +1,15 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestSuse
+    class Plugin < Vagrant.plugin("2")
+      name "SUSE guest"
+      description "SUSE guest support."
+
+      guest("suse") do
+        require File.expand_path("../guest", __FILE__)
+        Guest
+      end
+    end
+  end
+end

data/plugins/guests/ubuntu/guest.rb

@@ -0,0 +1,44 @@
+require "vagrant"
+
+require Vagrant.source_root.join("plugins/guests/debian/guest")
+
+module VagrantPlugins
+  module GuestUbuntu
+    class Guest < VagrantPlugins::GuestDebian::Guest
+      def mount_shared_folder(name, guestpath, options)
+        # Mount it like normal
+        super
+
+        # Emit an upstart event if upstart is available
+        vm.communicate.sudo("[ -x /sbin/initctl ] && /sbin/initctl emit vagrant-mounted MOUNTPOINT=#{guestpath}")
+      end
+
+      def mount_nfs(ip, folders)
+        # Mount it like normal
+        super
+
+        # Emit an upstart events if upstart is available
+        folders.each do |name, opts|
+          real_guestpath = expanded_guest_path(opts[:guestpath])
+          vm.communicate.sudo("[ -x /sbin/initctl ] && /sbin/initctl emit vagrant-mounted MOUNTPOINT=#{real_guestpath}")
+        end
+      end
+
+      def change_host_name(name)
+        vm.communicate.tap do |comm|
+          if !comm.test("sudo hostname | grep '^#{name}$'")
+            comm.sudo("sed -i 's/.*$/#{name}/' /etc/hostname")
+            comm.sudo("sed -i 's@^\\(127[.]0[.]1[.]1[[:space:]]\\+\\)@\\1#{name} #{name.split('.')[0]} @' /etc/hosts")
+            if comm.test("[ `lsb_release -c -s` = hardy ]")
+                # hostname.sh returns 1, so I grep for the right name in /etc/hostname just to have a 0 exitcode
+                comm.sudo("/etc/init.d/hostname.sh start; grep '#{name}' /etc/hostname")
+            else
+                comm.sudo("service hostname start")
+            end
+            comm.sudo("hostname --fqdn > /etc/mailname")
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/guests/ubuntu/plugin.rb

@@ -0,0 +1,15 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestUbuntu
+    class Plugin < Vagrant.plugin("2")
+      name "Ubuntu guest"
+      description "Ubuntu guest support."
+
+      guest("ubuntu") do
+        require File.expand_path("../guest", __FILE__)
+        Guest
+      end
+    end
+  end
+end

data/{lib/vagrant/hosts/arch.rb → plugins/hosts/arch/host.rb}

@@ -1,8 +1,21 @@
-module Vagrant
-  module Hosts
-    class Arch < Linux
+require "vagrant"
+
+require Vagrant.source_root.join("plugins/hosts/linux/host")
+
+module VagrantPlugins
+  module HostArch
+    class Host < VagrantPlugins::HostLinux::Host
       def self.match?
-        File.exist?("/etc/os-release") && File.read("/etc/os-release") =~ /arch linux/i
+        File.exist?("/etc/arch-release")
+      end
+
+      def self.nfs?
+        # HostLinux checks for nfsd which returns false unless the
+        # services are actively started. This leads to a misleading
+        # error message. Checking for nfs (no d) seems to work
+        # regardless. Also fixes useless use of cat, regex, and
+        # redirection.
+        Kernel.system("grep -Fq nfs /proc/filesystems")
       end
 
       # Normal, mid-range precedence.
@@ -48,7 +61,7 @@ module Vagrant
       # This tests to see if systemd is used on the system. This is used
       # in newer versions of Arch, and requires a change in behavior.
       def systemd?
-        Kernel.system("which systemctl &>/dev/null")
+        `ps -o comm= 1`.chomp == 'systemd'
       end
     end
   end

data/plugins/hosts/arch/plugin.rb

@@ -0,0 +1,15 @@
+require "vagrant"
+
+module VagrantPlugins
+  module HostArch
+    class Plugin < Vagrant.plugin("2")
+      name "Arch host"
+      description "Arch host support."
+
+      host("arch") do
+        require File.expand_path("../host", __FILE__)
+        Host
+      end
+    end
+  end
+end

data/{lib/vagrant/hosts/bsd.rb → plugins/hosts/bsd/host.rb}

@@ -1,16 +1,17 @@
 require 'log4r'
 
+require "vagrant"
 require 'vagrant/util/platform'
 
-module Vagrant
-  module Hosts
+module VagrantPlugins
+  module HostBSD
     # Represents a BSD host, such as FreeBSD and Darwin (Mac OS X).
-    class BSD < Base
-      include Util
-      include Util::Retryable
+    class Host < Vagrant.plugin("2", :host)
+      include Vagrant::Util
+      include Vagrant::Util::Retryable
 
       def self.match?
-        Util::Platform.darwin? || Util::Platform.bsd?
+        Vagrant::Util::Platform.darwin? || Vagrant::Util::Platform.bsd?
       end
 
       def self.precedence
@@ -66,9 +67,9 @@ module Vagrant
         output = false
 
         File.read("/etc/exports").lines.each do |line|
-          if line =~ /^# VAGRANT-BEGIN: (.+?)$/
-            if valid_ids.include?($1.to_s)
-              @logger.debug("Valid ID: #{$1.to_s}")
+          if id = line[/^# VAGRANT-BEGIN: (.+?)$/, 1]
+            if valid_ids.include?(id)
+              @logger.debug("Valid ID: #{id}")
             else
               if !output
                 # We want to warn the user but we only want to output once
@@ -76,8 +77,8 @@ module Vagrant
                 output = true
               end
 
-              @logger.info("Invalid ID, pruning: #{$1.to_s}")
-              nfs_cleanup($1.to_s)
+              @logger.info("Invalid ID, pruning: #{id}")
+              nfs_cleanup(id)
             end
           end
         end
@@ -88,6 +89,10 @@ module Vagrant
       def nfs_cleanup(id)
         return if !File.exist?("/etc/exports")
 
+        # Escape sed-sensitive characters:
+        id = id.gsub("/", "\\/")
+        id = id.gsub(".", "\\.")
+
         # Use sed to just strip out the block of code which was inserted
         # by Vagrant, and restart NFS.
         system("sudo sed -e '/^# VAGRANT-BEGIN: #{id}/,/^# VAGRANT-END: #{id}/ d' -ibak /etc/exports")