vagrant-fixed-ssh 1.0.7

data/lib/vagrant/guest/linux/config.rb

@@ -0,0 +1,19 @@
+module Vagrant
+  module Guest
+    class Linux < Vagrant::Guest::Base
+      # A custom config class which will be made accessible via `config.linux`
+      # This is not necessary for all system implementers, of course. However,
+      # generally, Vagrant tries to make almost every aspect of its execution
+      # configurable, and this assists that goal.
+      class LinuxConfig < Vagrant::Config::Base
+        attr_accessor :halt_timeout
+        attr_accessor :halt_check_interval
+
+        def initialize
+          @halt_timeout = 30
+          @halt_check_interval = 1
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/guest/linux/error.rb

@@ -0,0 +1,9 @@
+module Vagrant
+  module Guest
+    class Linux < Vagrant::Guest::Base
+      class LinuxError < Errors::VagrantError
+        error_namespace("vagrant.guest.linux")
+      end
+    end
+  end
+end

data/lib/vagrant/guest/openbsd.rb

@@ -0,0 +1,20 @@
+module Vagrant
+  module Guest
+    class OpenBSD < Base
+      def halt
+        vm.channel.sudo("shutdown -p -h now")
+
+        # Wait until the VM's state is actually powered off. If this doesn't
+        # occur within a reasonable amount of time then simply return which
+        # will cause Vagrant to force kill the machine.
+        count = 0
+        while vm.state != :poweroff
+          count += 1
+
+          return if count >= 30
+          sleep 1
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/guest/redhat.rb

@@ -0,0 +1,67 @@
+require 'set'
+require 'tempfile'
+
+require 'vagrant/util/template_renderer'
+
+module Vagrant
+  module Guest
+    class Redhat < Linux
+      # Make the TemplateRenderer top-level
+      include Vagrant::Util
+
+      def configure_networks(networks)
+        # 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.
+          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]}")
+
+          # Render and upload the network entry file to a deterministic
+          # temporary location.
+          entry = TemplateRenderer.render("guests/redhat/network_#{network[:type]}",
+                                          :options => network)
+
+          temp = Tempfile.new("vagrant")
+          temp.binmode
+          temp.write(entry)
+          temp.close
+
+          vm.channel.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")
+        end
+      end
+
+      # The path to the directory with the network configuration scripts.
+      # This is pulled out into its own directory since there are other
+      # operating systems (SuSE) which behave similarly but with a different
+      # path to the network scripts.
+      def network_scripts_dir
+        '/etc/sysconfig/network-scripts'
+      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")
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/guest/solaris.rb

@@ -0,0 +1,118 @@
+module Vagrant
+  module Guest
+    # A general Vagrant system implementation for "solaris".
+    #
+    # Contributed by Blake Irvin <b.irvin@modcloth.com>
+    class Solaris < Base
+      # A custom config class which will be made accessible via `config.solaris`
+      # This is not necessary for all system implementers, of course. However,
+      # generally, Vagrant tries to make almost every aspect of its execution
+      # configurable, and this assists that goal.
+      class SolarisConfig < Vagrant::Config::Base
+        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
+
+      # Here for whenever it may be used.
+      class SolarisError < 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.channel.execute("#{ifconfig_cmd} plumb")
+
+          if network[:type].to_sym == :static
+            vm.channel.execute("#{ifconfig_cmd} inet #{network[:ip]} netmask #{network[:netmask]}")
+            vm.channel.execute("#{ifconfig_cmd} up")
+            vm.channel.execute("#{su_cmd} sh -c \"echo '#{network[:ip]}' > /etc/hostname.#{device}\"")
+          elsif network[:type].to_sym == :dhcp
+            vm.channel.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.channel.test("#{su_cmd} hostname | grep '#{name}'")
+          vm.channel.execute("#{su_cmd} sh -c \"echo '#{name}' > /etc/nodename\"")
+          vm.channel.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
+        # Wait until the VM's state is actually powered off. If this doesn't
+        # occur within a reasonable amount of time (15 seconds by default),
+        # then simply return and allow Vagrant to kill the machine.
+        count = 0
+        last_error = nil
+        while vm.state != :poweroff
+          begin
+            vm.channel.execute("#{vm.config.solaris.suexec_cmd} /usr/sbin/poweroff")
+          rescue IOError => e
+            # Save the last error; if it's not shutdown in a reasonable amount
+            # of attempts we will re-raise the error so it's not hidden for
+            # all time
+            last_error = e
+          end
+
+          count += 1
+          if count >= vm.config.solaris.halt_timeout
+            # Check for last error and re-raise it
+            if last_error != nil
+              raise last_error
+            else
+              # Otherwise, just return
+              return
+            end
+          end
+
+          # Still opportunities remaining; sleep and loop
+          sleep vm.config.solaris.halt_check_interval
+        end # while
+      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.channel.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.channel.execute("#{vm.config.solaris.suexec_cmd} /sbin/mount -F vboxfs #{mount_options} #{name} #{guestpath}")
+
+        # chown the folder to the proper owner/group
+        vm.channel.execute("#{vm.config.solaris.suexec_cmd} chown `#{id_cmd} -u #{owner}`:`#{id_cmd} -g #{group}` #{guestpath}")
+      end
+    end
+  end
+end

data/lib/vagrant/guest/suse.rb

@@ -0,0 +1,17 @@
+module Vagrant
+  module Guest
+    class Suse < Redhat
+      def network_scripts_dir
+        '/etc/sysconfig/network/'
+      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("echo #{name} > /etc/HOSTNAME")
+          vm.channel.sudo("hostname #{name}")
+          vm.channel.sudo("sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} #{name.split('.')[0]} @' /etc/hosts")
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/guest/ubuntu.rb

@@ -0,0 +1,23 @@
+require 'vagrant/guest/debian'
+
+module Vagrant
+  module Guest
+    class Ubuntu < Debian
+      def mount_shared_folder(name, guestpath, options)
+        # Mount it like normal
+        super
+
+        # Emit an upstart event if upstart is available
+        vm.channel.sudo("[ -x /sbin/initctl ] && /sbin/initctl emit vagrant-mounted MOUNTPOINT=#{guestpath}")
+      end
+
+      def change_host_name(name)
+        if !vm.channel.test("sudo hostname | grep '^#{name}$'")
+          vm.channel.sudo("sed -i 's/.*$/#{name}/' /etc/hostname")
+          vm.channel.sudo("sed -i 's@^\\(127[.]0[.]1[.]1[[:space:]]\\+\\)@\\1#{name} #{name.split('.')[0]} @' /etc/hosts")
+          vm.channel.sudo("service hostname start")
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/hosts.rb

@@ -0,0 +1,37 @@
+require 'log4r'
+
+module Vagrant
+  module Hosts
+    autoload :Base,    'vagrant/hosts/base'
+    autoload :Arch,    'vagrant/hosts/arch'
+    autoload :BSD,     'vagrant/hosts/bsd'
+    autoload :FreeBSD, 'vagrant/hosts/freebsd'
+    autoload :Fedora,  'vagrant/hosts/fedora'
+    autoload :OpenSUSE, 'vagrant/hosts/opensuse'
+    autoload :Gentoo,  'vagrant/hosts/gentoo'
+    autoload :Linux,   'vagrant/hosts/linux'
+    autoload :Windows, 'vagrant/hosts/windows'
+
+    # This method detects the correct host based on the `match?` methods
+    # implemented in the registered hosts.
+    def self.detect(registry)
+      logger = Log4r::Logger.new("vagrant::hosts")
+
+      # Sort the hosts by their precedence
+      host_klasses = registry.to_hash.values
+      host_klasses = host_klasses.sort_by { |a| a.precedence }.reverse
+      logger.debug("Host path search classes: #{host_klasses.inspect}")
+
+      # Test for matches and return the host class that matches
+      host_klasses.each do |klass|
+        if klass.match?
+          logger.info("Host class: #{klass}")
+          return klass
+        end
+      end
+
+      # No matches found...
+      return nil
+    end
+  end
+end

data/lib/vagrant/hosts/arch.rb

@@ -0,0 +1,55 @@
+module Vagrant
+  module Hosts
+    class Arch < Linux
+      def self.match?
+        File.exist?("/etc/os-release") && File.read("/etc/os-release") =~ /arch linux/i
+      end
+
+      # Normal, mid-range precedence.
+      def self.precedence
+        5
+      end
+
+      def nfs_export(id, ip, folders)
+        output = TemplateRenderer.render('nfs/exports_linux',
+                                         :uuid => id,
+                                         :ip => ip,
+                                         :folders => folders)
+
+        @ui.info I18n.t("vagrant.hosts.arch.nfs_export.prepare")
+        sleep 0.5
+
+        nfs_cleanup(id)
+
+        output.split("\n").each do |line|
+          # This should only ask for administrative permission once, even
+          # though its executed in multiple subshells.
+          system(%Q[sudo su root -c "echo '#{line}' >> /etc/exports"])
+        end
+
+        if systemd?
+          # Call start to be nice. This will be a no-op if things are
+          # already running. Then use exportfs to pick up the changes we
+          # just made.
+          system("sudo systemctl start nfsd.service rpc-idmapd.service rpc-mountd.service rpcbind.service")
+          system("sudo exportfs -r")
+        else
+          # The restarting of services when we might not need to can be
+          # considered evil, but this will be obviated by systemd soon
+          # enough anyway.
+          system("sudo /etc/rc.d/rpcbind restart")
+          system("sudo /etc/rc.d/nfs-common restart")
+          system("sudo /etc/rc.d/nfs-server restart")
+        end
+      end
+
+      protected
+
+      # 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")
+      end
+    end
+  end
+end

data/lib/vagrant/hosts/base.rb

@@ -0,0 +1,66 @@
+module Vagrant
+  module Hosts
+    # Interface for classes which house behavior that is specific
+    # to the host OS that is running Vagrant.
+    #
+    # By default, Vagrant will attempt to choose the best option
+    # for your machine, but the host may also be explicitly set
+    # via the `config.vagrant.host` parameter.
+    class Base
+      # This returns true/false depending on if the current running system
+      # matches the host class.
+      #
+      # @return [Boolean]
+      def self.match?
+        nil
+      end
+
+      # The precedence of the host when checking for matches. This is to
+      # allow certain host such as generic OS's ("Linux", "BSD", etc.)
+      # to be specified last.
+      #
+      # The hosts with the higher numbers will be checked first.
+      #
+      # If you're implementing a basic host, you can probably ignore this.
+      def self.precedence
+        5
+      end
+
+      # Initializes a new host class.
+      #
+      # The only required parameter is a UI object so that the host
+      # objects have some way to communicate with the outside world.
+      #
+      # @param [UI] ui UI for the hosts to output to.
+      def initialize(ui)
+        @ui = ui
+      end
+
+      # Returns true of false denoting whether or not this host supports
+      # NFS shared folder setup. This method ideally should verify that
+      # NFS is installed.
+      #
+      # @return [Boolean]
+      def nfs?
+        false
+      end
+
+      # Exports the given hash of folders via NFS.
+      #
+      # @param [String] id A unique ID that is guaranteed to be unique to
+      #   match these sets of folders.
+      # @param [String] ip IP of the guest machine.
+      # @param [Hash] folders Shared folders to sync.
+      def nfs_export(id, ip, folders)
+      end
+
+      # Prunes any NFS exports made by Vagrant which aren't in the set
+      # of valid ids given.
+      #
+      # @param [Array<String>] valid_ids Valid IDs that should not be
+      #   pruned.
+      def nfs_prune(valid_ids)
+      end
+    end
+  end
+end

data/lib/vagrant/hosts/bsd.rb

@@ -0,0 +1,97 @@
+require 'log4r'
+
+require 'vagrant/util/platform'
+
+module Vagrant
+  module Hosts
+    # Represents a BSD host, such as FreeBSD and Darwin (Mac OS X).
+    class BSD < Base
+      include Util
+      include Util::Retryable
+
+      def self.match?
+        Util::Platform.darwin? || Util::Platform.bsd?
+      end
+
+      def self.precedence
+        # Set a lower precedence because this is a generic OS. We
+        # want specific distros to match first.
+        2
+      end
+
+      def initialize(*args)
+        super
+
+        @logger = Log4r::Logger.new("vagrant::hosts::bsd")
+        @nfs_restart_command = "sudo nfsd restart"
+        @nfs_exports_template = "nfs/exports"
+      end
+
+      def nfs?
+        retryable(:tries => 10, :on => TypeError) do
+          system("which nfsd > /dev/null 2>&1")
+        end
+      end
+
+      def nfs_export(id, ip, folders)
+        output = TemplateRenderer.render(@nfs_exports_template,
+                                         :uuid => id,
+                                         :ip => ip,
+                                         :folders => folders)
+
+        # The sleep ensures that the output is truly flushed before any `sudo`
+        # commands are issued.
+        @ui.info I18n.t("vagrant.hosts.bsd.nfs_export")
+        sleep 0.5
+
+        # First, clean up the old entry
+        nfs_cleanup(id)
+
+        # Output the rendered template into the exports
+        output.split("\n").each do |line|
+          line = line.gsub('"', '\"')
+          system(%Q[sudo su root -c "echo '#{line}' >> /etc/exports"])
+        end
+
+        # We run restart here instead of "update" just in case nfsd
+        # is not starting
+        system(@nfs_restart_command)
+      end
+
+      def nfs_prune(valid_ids)
+        return if !File.exist?("/etc/exports")
+
+        @logger.info("Pruning invalid NFS entries...")
+
+        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}")
+            else
+              if !output
+                # We want to warn the user but we only want to output once
+                @ui.info I18n.t("vagrant.hosts.bsd.nfs_prune")
+                output = true
+              end
+
+              @logger.info("Invalid ID, pruning: #{$1.to_s}")
+              nfs_cleanup($1.to_s)
+            end
+          end
+        end
+      end
+
+      protected
+
+      def nfs_cleanup(id)
+        return if !File.exist?("/etc/exports")
+
+        # 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")
+      end
+    end
+  end
+end