tnargav 1.2.3 → 1.3.3

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

@@ -0,0 +1,32 @@
+# A general Vagrant system implementation for "solaris 11".
+#
+# Contributed by Jan Thomas Moldung <janth@moldung.no>
+
+module VagrantPlugins
+  module GuestSolaris11
+    module Cap
+      class ConfigureNetworks
+        def self.configure_networks(machine, networks)
+          networks.each do |network|
+            device = "#{machine.config.solaris11.device}#{network[:interface]}"
+            su_cmd = machine.config.solaris11.suexec_cmd
+            mask = "#{network[:netmask]}"
+            cidr = mask.split(".").map { |e| e.to_i.to_s(2).rjust(8, "0") }.join.count("1").to_s
+            #ifconfig_cmd = "#{su_cmd} /sbin/ifconfig #{device}"
+            #machine.communicate.execute("#{ifconfig_cmd} plumb")
+            if network[:type].to_sym == :static
+              #machine.communicate.execute("#{ifconfig_cmd} inet #{network[:ip]} netmask #{network[:netmask]}")
+              #machine.communicate.execute("#{ifconfig_cmd} up")
+              #machine.communicate.execute("#{su_cmd} sh -c \"echo '#{network[:ip]}' > /etc/hostname.#{device}\"")
+              # ipadm create-addr -T static -a local=172.16.10.15/24 net2/v4
+              machine.communicate.execute("#{su_cmd} ipadm create-addr -T static -a #{network[:ip]}/#{cidr} #{device}/v4")
+            elsif network[:type].to_sym == :dhcp
+              #machine.communicate.execute("#{ifconfig_cmd} dhcp start")
+              machine.communicate.execute("#{su_cmd} ipadm create-addr -T addrconf #{device}/v4")
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+# A general Vagrant system implementation for "solaris 11".
+#
+# Contributed by Jan Thomas Moldung <janth@moldung.no>
+
+module VagrantPlugins
+  module GuestSolaris11
+    module Cap
+      class Halt
+        def self.halt(machine)
+          # There should be an exception raised if the line
+          #
+          #     vagrant::::profiles=Primary Administrator
+          #
+          # does not exist in /etc/user_attr. TODO
+          begin
+            machine.communicate.execute(
+              "#{machine.config.solaris11.suexec_cmd} /usr/sbin/shutdown -y -i5 -g0")
+          rescue IOError
+            # Ignore, this probably means connection closed because it
+            # shut down.
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+# A general Vagrant system implementation for "solaris 11".
+#
+# Contributed by Jan Thomas Moldung <janth@moldung.no>
+
+module VagrantPlugins
+  module GuestSolaris11
+    module Cap
+      class MountVirtualBoxSharedFolder
+        def self.mount_virtualbox_shared_folder(machine, 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
+          machine.communicate.execute("#{machine.config.solaris11.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}`"
+          if options[:mount_options]
+            mount_options += ",#{options[:mount_options].join(",")}"
+          end
+
+          machine.communicate.execute("#{machine.config.solaris11.suexec_cmd} /sbin/mount -F vboxfs #{mount_options} #{name} #{guestpath}")
+
+          # chown the folder to the proper owner/group
+          machine.communicate.execute("#{machine.config.solaris11.suexec_cmd} chown `#{id_cmd} -u #{owner}`:`#{id_cmd} -g #{group}` #{guestpath}")
+        end
+      end
+    end
+  end
+end

data/plugins/guests/solaris11/config.rb

@@ -0,0 +1,22 @@
+# A general Vagrant system implementation for "solaris 11".
+#
+# Contributed by Jan Thomas Moldung <janth@moldung.no>
+
+module VagrantPlugins
+  module GuestSolaris11
+    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 = "net"
+      end
+    end
+  end
+end

data/plugins/guests/solaris11/guest.rb

@@ -0,0 +1,15 @@
+# A general Vagrant system implementation for "solaris 11".
+#
+# Contributed by Jan Thomas Moldung <janth@moldung.no>
+
+require "vagrant"
+
+module VagrantPlugins
+  module GuestSolaris11
+    class Guest < Vagrant.plugin("2", :guest)
+      def detect?(machine)
+        machine.communicate.test("uname -s | grep SunOS")
+      end
+    end
+  end
+end

data/plugins/guests/solaris11/plugin.rb

@@ -0,0 +1,44 @@
+# A general Vagrant system implementation for "solaris 11".
+#
+# Contributed by Jan Thomas Moldung <janth@moldung.no>
+
+require "vagrant"
+
+module VagrantPlugins
+  module GuestSolaris11
+    class Plugin < Vagrant.plugin("2")
+      name "Solaris 11 guest."
+      description "Solaris 11 guest support."
+
+      config("solaris11") do
+        require File.expand_path("../config", __FILE__)
+        Config
+      end
+
+      guest("solaris11")  do
+        require File.expand_path("../guest", __FILE__)
+        Guest
+      end
+
+      guest_capability("solaris11", "change_host_name") do
+        require_relative "cap/change_host_name"
+        Cap::ChangeHostName
+      end
+
+      guest_capability("solaris11", "configure_networks") do
+        require_relative "cap/configure_networks"
+        Cap::ConfigureNetworks
+      end
+
+      guest_capability("solaris11", "halt") do
+        require_relative "cap/halt"
+        Cap::Halt
+      end
+
+      guest_capability("solaris11", "mount_virtualbox_shared_folder") do
+        require_relative "cap/mount_virtualbox_shared_folder"
+        Cap::MountVirtualBoxSharedFolder
+      end
+    end
+  end
+end

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

@@ -0,0 +1,60 @@
+require "set"
+require "tempfile"
+
+require "vagrant/util/retryable"
+require "vagrant/util/template_renderer"
+
+module VagrantPlugins
+  module GuestSuse
+    module Cap
+      class ConfigureNetworks
+        extend Vagrant::Util::Retryable
+        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 /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)
+
+            temp = Tempfile.new("vagrant")
+            temp.binmode
+            temp.write(entry)
+            temp.close
+
+            machine.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|
+            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")
+            end
+
+            machine.communicate.sudo("rm /tmp/vagrant-network-entry_#{interface}")
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/guests/suse/plugin.rb

@@ -16,6 +16,11 @@ module VagrantPlugins
         Cap::ChangeHostName
       end
 
+      guest_capability("suse", "configure_networks") do
+        require_relative "cap/configure_networks"
+        Cap::ConfigureNetworks
+      end
+
       guest_capability("suse", "network_scripts_dir") do
         require_relative "cap/network_scripts_dir"
         Cap::NetworkScriptsDir

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

@@ -14,6 +14,7 @@ module VagrantPlugins
                 comm.sudo("service hostname start")
               end
               comm.sudo("hostname --fqdn > /etc/mailname")
+              comm.sudo("ifdown -a; ifup -a; ifup -a --allow=hotplug")
             end
           end
         end

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

@@ -0,0 +1,19 @@
+require Vagrant.source_root.join("plugins/guests/linux/cap/mount_nfs")
+
+module VagrantPlugins
+  module GuestUbuntu
+    module Cap
+      class MountNFS < GuestLinux::Cap::MountNFS
+        def self.mount_nfs_folder(machine, ip, folders)
+          super
+
+          # Emit an upstart events if upstart is available
+          folders.each do |name, opts|
+            real_guestpath =  machine.guest.capability(:shell_expand_guest_path, opts[:guestpath])
+            machine.communicate.sudo("[ -x /sbin/initctl ] && /sbin/initctl emit vagrant-mounted MOUNTPOINT=#{real_guestpath}")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+require Vagrant.source_root.join("plugins/guests/linux/cap/mount_virtualbox_shared_folder")
+
+module VagrantPlugins
+  module GuestUbuntu
+    module Cap
+      class MountVirtualBoxSharedFolder < GuestLinux::Cap::MountVirtualBoxSharedFolder
+        def self.mount_virtualbox_shared_folder(machine, name, guestpath, options)
+          super
+          machine.communicate.sudo("[ -x /sbin/initctl ] && /sbin/initctl emit vagrant-mounted MOUNTPOINT=#{guestpath}")
+        end
+      end
+    end
+  end
+end

data/plugins/guests/ubuntu/guest.rb

@@ -8,25 +8,6 @@ module VagrantPlugins
       def detect?(machine)
         machine.communicate.test("cat /etc/issue | grep 'Ubuntu'")
       end
-
-      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
     end
   end
 end

data/plugins/guests/ubuntu/plugin.rb

@@ -15,6 +15,16 @@ module VagrantPlugins
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
+
+      guest_capability("ubuntu", "mount_nfs_folder") do
+        require_relative "cap/mount_nfs"
+        Cap::MountNFS
+      end
+
+      guest_capability("ubuntu", "mount_virtualbox_shared_folder") do
+        require_relative "cap/mount_virtualbox_shared_folder"
+        Cap::MountVirtualBoxSharedFolder
+      end
     end
   end
 end

data/plugins/hosts/arch/host.rb

@@ -23,36 +23,13 @@ module VagrantPlugins
         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
-
+      def initialize
         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")
+          @nfs_check_command = "/usr/sbin/systemctl status nfsd"
+          @nfs_start_command = "/usr/sbin/systemctl start nfsd rpc-idmapd rpc-mountd rpcbind"
         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")
+          @nfs_check_command = "/etc/rc.d/nfs-server status"
+          @nfs_start_command = "sh -c 'for s in {rpcbind,nfs-common,nfs-server}; do /etc/rc.d/$s start; done'"
         end
       end
 

data/plugins/hosts/bsd/host.rb

@@ -34,11 +34,81 @@ module VagrantPlugins
         end
       end
 
-      def nfs_export(id, ip, folders)
+      def nfs_export(id, ips, folders)
+        # We need to build up mapping of directories that are enclosed
+        # within each other because the exports file has to have subdirectories
+        # of an exported directory on the same line. e.g.:
+        #
+        #   "/foo" "/foo/bar" ...
+        #   "/bar"
+        #
+        # We build up this mapping within the following hash.
+        @logger.debug("Compiling map of sub-directories for NFS exports...")
+        dirmap = {}
+        folders.each do |_, opts|
+          hostpath = opts[:hostpath].dup
+          hostpath.gsub!('"', '\"')
+
+          found = false
+          dirmap.each do |dirs, diropts|
+            dirs.each do |dir|
+              if dir.start_with?(hostpath) || hostpath.start_with?(dir)
+                # TODO: verify opts and diropts are _identical_, raise an error
+                # if not. NFS mandates subdirectories have identical options.
+                dirs << hostpath
+                found = true
+                break
+              end
+            end
+
+            break if found
+          end
+
+          if !found
+            dirmap[[hostpath]] = opts.dup
+          end
+        end
+
+        # Sort all the keys by length so that the directory closest to
+        # the root is exported first.
+        dirmap.each do |dirs, _|
+          dirs.sort_by! { |d| d.length }
+        end
+
+        # Setup the NFS options
+        dirmap.each do |dirs, opts|
+          if !opts[:bsd__nfs_options]
+            opts[:bsd__nfs_options] = ["alldirs"]
+          end
+
+          hasmapall = false
+          opts[:bsd__nfs_options].each do |opt|
+            if opt =~ /^mapall=/
+              hasmapall = true
+              break
+            end
+          end
+
+          if !hasmapall
+            opts[:bsd__nfs_options] << "mapall=#{opts[:map_uid]}:#{opts[:map_gid]}"
+          end
+
+          opts[:bsd__compiled_nfs_options] = opts[:bsd__nfs_options].map do |opt|
+            "-#{opt}"
+          end.join(" ")
+        end
+
+        @logger.info("Exporting the following for NFS...")
+        dirmap.each do |dirs, opts|
+          @logger.info("NFS DIR: #{dirs.inspect}")
+          @logger.info("NFS OPTS: #{opts.inspect}")
+        end
+
         output = TemplateRenderer.render(@nfs_exports_template,
                                          :uuid => id,
-                                         :ip => ip,
-                                         :folders => folders)
+                                         :ips => ips,
+                                         :folders => dirmap,
+                                         :user => Process.uid)
 
         # The sleep ensures that the output is truly flushed before any `sudo`
         # commands are issued.
@@ -50,8 +120,9 @@ module VagrantPlugins
 
         # 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"])
+          line.gsub!('"', '\"')
+          line.gsub!("'", "'\\\\''")
+          system(%Q[sudo -s -- "echo '#{line}' >> /etc/exports"])
         end
 
         # We run restart here instead of "update" just in case nfsd
@@ -65,9 +136,10 @@ module VagrantPlugins
         @logger.info("Pruning invalid NFS entries...")
 
         output = false
+        user = Process.uid
 
         File.read("/etc/exports").lines.each do |line|
-          if id = line[/^# VAGRANT-BEGIN: (.+?)$/, 1]
+          if id = line[/^# VAGRANT-BEGIN:( #{user})? ([A-Za-z0-9-]+?)$/, 2]
             if valid_ids.include?(id)
               @logger.debug("Valid ID: #{id}")
             else
@@ -82,6 +154,8 @@ module VagrantPlugins
             end
           end
         end
+      rescue Errno::EACCES
+        raise Vagrant::Errors::NFSCantReadExports
       end
 
       protected
@@ -93,9 +167,11 @@ module VagrantPlugins
         id = id.gsub("/", "\\/")
         id = id.gsub(".", "\\.")
 
+        user = Process.uid
+
         # 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")
+        system("sudo sed -E -e '/^# VAGRANT-BEGIN:( #{user})? #{id}/,/^# VAGRANT-END:( #{user})? #{id}/ d' -ibak /etc/exports")
       end
     end
   end