vagrant-unbundled 2.1.4.0 → 2.2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55f54add6ab420065395900bc5b05ed6eb9b44d4cb01ae3963f96907699b16dc
-  data.tar.gz: 00e3b805672cb98dacd4649006cdd1d06bede102fc52db08eaeb8e7cd36023e1
+  metadata.gz: eca7fc517602ce921c69b2a141cc57079df7b2a0834dc306e5820ea2bb107bee
+  data.tar.gz: 41808cc7d78dfbb081da51f3eb544c797b672e3eecefb124c6e3c2d913281593
 SHA512:
-  metadata.gz: a111e944a6133ef9e2e910c6865f8c698c675d460d4ede074f5a396be21811e6e038a33a0f0b587fa83289b8fd06128a8e0ff58a0b4c79715f7952840443d4ad
-  data.tar.gz: 6a03e2073fda057f0db1a217fef1162e672d70f56f74c0e932bf3f2bfe3a6130c5170c22d7bcb3b1840c6edc9cae524c84e0bf28d7225a1f91e8758e87824ef0
+  metadata.gz: 4c9588b9b89bb650b8973ab683c8b0ed011cde2b0078476dab14b9acfc121c7b409ce5dc4557330539177895bd04b0a237c9f348a80070e583a6453cd6f1621a
+  data.tar.gz: bf0449d3b45d3edbbe91dcbf70272cb830d65a7e35b200f5b461eebcced575e3438e2f73620bcdf4fd7ccc75b9b3ecfce928da6382b95c5ac3e584ea1fe87f04

data/CHANGELOG.md

@@ -1,10 +1,67 @@
-## Next version (August 30, 2018)
+## 2.2.0 (October 16, 2018)
+
+FEATURES:
+
+- command/cloud: Introduce `vagrant cloud` subcommand to Vagrant [GH-10148]
+- command/upload: Add command for uploading files to guest [GH-10263]
+- command/winrm: Add command for executing guest commands via WinRM [GH-10263]
+- command/winrm-config: Add command for providing WinRM configuration [GH-10263]
+
+IMPROVEMENTS:
+
+- core: Ensure file paths are identical when checking for cwd [GH-10220]
+- core: Add config option `ignore_box_vagrantfile` for ignoring vagrantfile inside box [GH-10242]
+- core/triggers: Add abort option to core triggers [GH-10232]
+- core/triggers: Introduce `ruby` option for trigger [GH-10267]
+- contrib/bash: Add completion for snapshot names for vagrant snapshot restore|delete [GH-9054]
+- providers/docker: Build docker from git repo [GH-10221]
+- providers/hyperv: Update Hyper-V admin check and allow override via ENV variable [GH-10275]
+- providers/virtualbox: Allow base_mac to be optional [GH-10255]
+- provisioners/salt: bootstrap-salt.sh: use -s with curl [GH-9432]
+- provisioners/salt: remove leading space with bootstrap_options [GH-9431]
+
+BUG FIXES:
+
+- core/environment: Provide rgloader for local plugin installations [GH-10279]
+- contrib/sudoers/osx: Fix missing comma and add remove export alias [GH-10235]
+- guest/redhat: Update restart logic in redhat change_host_name cap [GH-10223]
+- guest/windows: Allow special characters in SMB password field [GH-10219]
+- providers/hyperv: Only use AutomaticCheckpointsEnabled when available [GH-10264]
+- providers/hyperv: Only use CheckpointType when available [GH-10265]
+- provisioners/ansible: Fix remote directory creation [GH-10259, GH-10258]
+- provisioners/puppet: Properly set env variables for puppet provisioner on windows [GH-10218]
+- provisioners/salt: Properly set salt pillar variables for windows guests [GH-10215]
+- synced_folders/rsync: Ensure unique tmp dirs for ControlPath with rsync [GH-10291]
+
+## 2.1.5 (September 12, 2018)
+
+IMPROVEMENTS:
+
+- core: Add `Vagrant.version?` helper method [GH-10191]
+- core: Scrub sensitive values from logger output [GH-10200]
+- core: Prevent multiple evaluations of Vagrantfile [GH-10199]
+- command/init: Support VAGRANT_DEFAULT_TEMPLATE env var [GH-10171]
+- command/powershell: Improve doc help string and fix winrm locales error [GH-10189]
+- contrib/bash: autocomplete running VM names for destroy subcommand [GH-10168]
+- guest/debian: Use `sudo` to determine if systemd is in use for hardened systems [GH-10198]
+- guest/openbsd: Add IPv6 network template for OpenBSD machines [GH-8912]
+- provisioners/salt: Allow non-windows hosts to pass along version [GH-10194]
+
+BUG FIXES:
+
+- core: Fix Vagrant.has_plugin? behavior before plugins are initialized [GH-10165]
+- core: Check verify_host_key for falsey or :never values when generating ssh config [GH-10182]
+- guest/linux: Filter out empty strings and loopback interfaces when constructing list of network interfaces [GH-10092]
+- provider/hyper-v: Check for automatic checkpoint support before configuring [GH-10181]
+
+## 2.1.4 (August 30, 2018)
 
 BUG FIXES:
 
 - core: Fix local plugin installation prompt answer parsing [GH-10154]
 - core: Reset internal environment after plugin loading [GH-10155]
 - host/windows: Fix SMB list parsing when extra fields are included [GH-10156]
+- provisioners/ansible_local: Fix umask setting permission bug [GH-10140]
 
 ## 2.1.3 (August 29, 2018)
 

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-unbundled (2.1.4.0)
+    vagrant-unbundled (2.2.0.0)
       childprocess (~> 0.6.0)
       erubis (~> 2.7.0)
       hashicorp-checkpoint (~> 0.1.5)
@@ -22,8 +22,10 @@ PATH
       net-sftp (~> 2.1)
       net-ssh (~> 5.0.0)
       rb-kqueue (~> 0.2.0)
-      rest-client (~> 2.0)
+      rest-client (>= 1.6.0, < 3.0)
       ruby_dep (<= 1.3.1)
+      rubyzip (~> 1.2.2)
+      vagrant_cloud (~> 2.0.0)
       wdm (~> 0.1.0)
       winrm (~> 2.1)
       winrm-elevated (~> 1.1)
@@ -110,12 +112,14 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
+    vagrant_cloud (2.0.1)
+      rest-client (~> 2.0.2)
     wdm (0.1.1)
     webmock (2.3.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    winrm (2.2.3)
+    winrm (2.3.0)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -127,7 +131,7 @@ GEM
     winrm-elevated (1.1.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.3.0)
+    winrm-fs (1.3.1)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
@@ -146,4 +150,4 @@ DEPENDENCIES
   webmock (~> 2.3.1)
 
 BUNDLED WITH
-   1.16.4
+   1.17.1

data/contrib/bash/completion.sh

@@ -53,7 +53,7 @@ __vagrantinvestigate() {
 _vagrant() {
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
-    commands="box connect destroy docker-exec docker-logs docker-run global-status halt help init list-commands login package plugin provision push rdp reload resume rsync rsync-auto share snapshot ssh ssh-config status suspend up version"
+    commands="box cloud connect destroy docker-exec docker-logs docker-run global-status halt help init list-commands login package plugin provision push rdp reload resume rsync rsync-auto share snapshot ssh ssh-config status suspend up version"
 
     if [ $COMP_CWORD == 1 ]
     then
@@ -79,7 +79,7 @@ _vagrant() {
               COMPREPLY=($(compgen -W "${up_commands} ${vm_list}" -- ${cur}))
               return 0
             ;;
-            "ssh"|"provision"|"reload"|"halt"|"suspend"|"resume"|"ssh-config")
+            "destroy"|"ssh"|"provision"|"reload"|"halt"|"suspend"|"resume"|"ssh-config")
               vagrant_state_file=$(__vagrantinvestigate) || return 1
               if [[ -f "${vagrant_state_file}" ]]
               then
@@ -95,6 +95,11 @@ _vagrant() {
               COMPREPLY=($(compgen -W "${box_commands}" -- ${cur}))
               return 0
             ;;
+            "cloud")
+              cloud_commands="auth box search provider publish version"
+              COMPREPLY=($(compgen -W "${cloud_commands}" -- ${cur}))
+              return 0
+            ;;
             "plugin")
               plugin_commands="install license list uninstall update"
               COMPREPLY=($(compgen -W "${plugin_commands}" -- ${cur}))
@@ -140,6 +145,15 @@ _vagrant() {
               ;;
           esac
           ;;
+        "snapshot")
+          case "$prev" in
+            "restore"|"delete")
+              local snapshot_list=$(vagrant snapshot list)
+              COMPREPLY=($(compgen -W "${snapshot_list}" -- ${cur}))
+              return 0
+            ;;
+          esac
+          ;;
         *)
           ;;
       esac

data/contrib/sudoers/osx

@@ -7,4 +7,4 @@ Cmnd_Alias VAGRANT_SMB_LIST = /usr/sbin/sharing -l
 Cmnd_Alias VAGRANT_SMB_PLOAD = /bin/launchctl load -w /System/Library/LaunchDaemons/com.apple.smb.preferences.plist
 Cmnd_Alias VAGRANT_SMB_DLOAD = /bin/launchctl load -w /System/Library/LaunchDaemons/com.apple.smbd.plist
 Cmnd_Alias VAGRANT_SMB_DSTART = /bin/launchctl start com.apple.smbd
-%admin ALL=(root) NOPASSWD: VAGRANT_EXPORTS_ADD, VAGRANT_NFSD, VAGRANT_SMB_ADD, VAGRANT_SMB_REMOVE, VAGRANT_SMB_LIST, VAGRANT_SMB_PLOAD, VAGRANT_SMB_DLOAD VAGRANT_SMB_DSTART
+%admin ALL=(root) NOPASSWD: VAGRANT_EXPORTS_ADD, VAGRANT_NFSD, VAGRANT_EXPORTS_REMOVE, VAGRANT_SMB_ADD, VAGRANT_SMB_REMOVE, VAGRANT_SMB_LIST, VAGRANT_SMB_PLOAD, VAGRANT_SMB_DLOAD, VAGRANT_SMB_DSTART

data/lib/vagrant/environment.rb

@@ -167,20 +167,17 @@ module Vagrant
 
       # Initialize localized plugins
       plugins = Vagrant::Plugin::Manager.instance.localize!(self)
-
-      if !vagrantfile.config.vagrant.plugins.empty?
-        plugins = process_configured_plugins
-      end
-
       # Load any environment local plugins
       Vagrant::Plugin::Manager.instance.load_plugins(plugins)
 
+      # Initialize globalize plugins
       plugins = Vagrant::Plugin::Manager.instance.globalize!
+      # Load any global plugins
       Vagrant::Plugin::Manager.instance.load_plugins(plugins)
 
-      # Reset so Vagrantfile will be reloaded with expected support for
-      # any new plugins provided
-      post_plugins_reset!
+      if !vagrantfile.config.vagrant.plugins.empty?
+        plugins = process_configured_plugins
+      end
 
       # Call the hooks that does not require configurations to be loaded
       # by using a "clean" action runner
@@ -909,6 +906,13 @@ module Vagrant
       begin
         @logger.debug("Creating: #{@local_data_path}")
         FileUtils.mkdir_p(@local_data_path)
+        # Create the rgloader/loader file so we can use encoded files.
+        loader_file = @local_data_path.join("rgloader", "loader.rb")
+        if !loader_file.file?
+          source_loader = Vagrant.source_root.join("templates/rgloader.rb")
+          FileUtils.mkdir_p(@local_data_path.join("rgloader").to_s)
+          FileUtils.cp(source_loader.to_s, loader_file.to_s)
+        end
       rescue Errno::EACCES
         raise Errors::LocalDataDirectoryNotAccessible,
           local_data_path: @local_data_path.to_s
@@ -917,18 +921,6 @@ module Vagrant
 
     protected
 
-    # Unsets the internal vagrantfile and config_loader
-    # to force them to be regenerated. This is used after
-    # plugins have been loaded so that newly discovered
-    # plugin configurations are properly available
-    #
-    # @return [nil]
-    def post_plugins_reset!
-      @vagrantfile = nil
-      @config_loader = nil
-      nil
-    end
-
     # Check for any local plugins defined within the Vagrantfile. If
     # found, validate they are available. If they are not available,
     # request to install them, or raise an exception
@@ -982,7 +974,10 @@ module Vagrant
             name: spec.name, version: spec.version.to_s))
         end
         ui.info("\n")
-        Vagrant::Plugin::Manager.instance.localize!(self)
+        # Force halt after installation and require command to be run again. This
+        # will proper load any new locally installed plugins which are now available.
+        ui.warn(I18n.t("vagrant.plugins.local.install_rerun_command"))
+        exit(-1)
       end
       Vagrant::Plugin::Manager.instance.local_file.installed_plugins
     end

data/lib/vagrant/errors.rb

@@ -816,6 +816,30 @@ module Vagrant
       error_key(:unimplemented_provider_action)
     end
 
+    class UploadInvalidCompressionType < VagrantError
+      error_key(:upload_invalid_compression_type)
+    end
+
+    class UploadMissingExtractCapability < VagrantError
+      error_key(:upload_missing_extract_capability)
+    end
+
+    class UploadMissingTempCapability < VagrantError
+      error_key(:upload_missing_temp_capability)
+    end
+
+    class UploadSourceMissing < VagrantError
+      error_key(:upload_source_missing)
+    end
+
+    class UploaderError < VagrantError
+      error_key(:uploader_error)
+    end
+
+    class UploaderInterrupted < UploaderError
+      error_key(:uploader_interrupted)
+    end
+
     class VagrantInterrupt < VagrantError
       error_key(:interrupted)
     end
@@ -968,6 +992,10 @@ module Vagrant
       error_key(:power_off, "vagrant.actions.vm.export")
     end
 
+    class WinRMInvalidCommunicator < VagrantError
+      error_key(:winrm_invalid_communicator)
+    end
+
     class WSLVagrantVersionMismatch < VagrantError
       error_key(:wsl_vagrant_version_mismatch)
     end

data/lib/vagrant/machine.rb

@@ -593,7 +593,7 @@ module Vagrant
                       ).chomp
                     end
 
-      if vagrant_cwd != @env.root_path.to_s
+      if !File.identical?(vagrant_cwd.to_s, @env.root_path.to_s)
         if vagrant_cwd
           ui.warn(I18n.t(
             'vagrant.moved_cwd',

data/lib/vagrant/plugin/manager.rb

@@ -41,12 +41,14 @@ module Vagrant
         @system_file = StateFile.new(system_path) if system_path && system_path.file?
 
         @local_file = nil
+        @globalized = @localized = false
       end
 
       # Enable global plugins
       #
       # @return [Hash] list of plugins
       def globalize!
+        @globalized = true
         @logger.debug("Enabling globalized plugins")
         plugins = installed_plugins
         bundler_init(plugins)
@@ -56,8 +58,9 @@ module Vagrant
       # Enable environment local plugins
       #
       # @param [Environment] env Vagrant environment
-      # @return [Hash] list of plugins
+      # @return [Hash, nil] list of plugins
       def localize!(env)
+        @localized = true
         if env.local_data_path
           @logger.debug("Enabling localized plugins")
           @local_file = StateFile.new(env.local_data_path.join("plugins.json"))
@@ -68,6 +71,11 @@ module Vagrant
         end
       end
 
+      # @return [Boolean] local and global plugins are loaded
+      def ready?
+        @globalized && @localized
+      end
+
       # Initialize bundler with given plugins
       #
       # @param [Hash] plugins List of plugins
@@ -335,6 +343,32 @@ module Vagrant
         end
         nil
       end
+
+      # Check if the requested plugin is installed
+      #
+      # @param [String] name Name of plugin
+      # @param [String] version Specific version of the plugin
+      # @return [Boolean]
+      def plugin_installed?(name, version=nil)
+        # Make the requirement object
+        version = Gem::Requirement.new([version.to_s]) if version
+
+        # If plugins are loaded, check for match in loaded specs
+        if ready?
+          return installed_specs.any? do |s|
+            match = s.name == name
+            next match if !version
+            next match && version.satisfied_by?(s.version)
+          end
+        end
+
+        # Plugins are not loaded yet so check installed plugin data
+        plugin_info = installed_plugins[name]
+        return false if !plugin_info
+        return !!plugin_info if version.nil? || plugin_info["installed_gem_version"].nil?
+        installed_version = Gem::Version.new(plugin_info["installed_gem_version"])
+        version.satisfied_by?(installed_version)
+      end
     end
   end
 end

data/lib/vagrant/plugin/v2/trigger.rb

@@ -124,6 +124,10 @@ module Vagrant
               warn(trigger.warn)
             end
 
+            if trigger.abort
+              trigger_abort(trigger.abort)
+            end
+
             if trigger.run
               run(trigger.run, trigger.on_error, trigger.exit_codes)
             end
@@ -131,6 +135,10 @@ module Vagrant
             if trigger.run_remote
               run_remote(trigger.run_remote, trigger.on_error, trigger.exit_codes)
             end
+
+            if trigger.ruby_block
+              execute_ruby(trigger.ruby_block)
+            end
           end
         end
 
@@ -241,6 +249,21 @@ module Vagrant
             end
           end
         end
+
+        # Exits Vagrant immediately
+        #
+        # @param [Integer] code Code to exit Vagrant on
+        def trigger_abort(exit_code)
+          @machine.ui.warn(I18n.t("vagrant.trigger.abort"))
+          exit(exit_code)
+        end
+
+        # Calls the given ruby block for execution
+        #
+        # @param [Proc] ruby_block
+        def execute_ruby(ruby_block)
+          ruby_block.call(@env, @machine)
+        end
       end
     end
   end

data/lib/vagrant/util/curl_helper.rb

@@ -0,0 +1,96 @@
+module Vagrant
+  module Util
+    class CurlHelper
+
+      # Hosts that do not require notification on redirect
+      SILENCED_HOSTS = [
+        "vagrantcloud.com".freeze,
+        "vagrantup.com".freeze
+      ].freeze
+
+      def self.capture_output_proc(logger, ui, source=nil)
+        progress_data = ""
+        progress_regexp = /^\r\s*(\d.+?)\r/m
+
+        # Setup the proc that'll receive the real-time data from
+        # the downloader.
+        data_proc = Proc.new do |type, data|
+          # Type will always be "stderr" because that is the only
+          # type of data we're subscribed for notifications.
+
+          # Accumulate progress_data
+          progress_data << data
+
+          while true
+            # If the download has been redirected and we are no longer downloading
+            # from the original host, notify the user that the target host has
+            # changed from the source.
+            if progress_data.include?("Location")
+              location = progress_data.scan(/(^|[^\w-])Location: (.+?)$/m).flatten.compact.last.to_s.strip
+              if !location.empty?
+                location_uri = URI.parse(location)
+
+                unless location_uri.host.nil?
+                  redirect_notify = false
+                  logger.info("download redirected to #{location}")
+                  source_uri = URI.parse(source)
+                  source_host = source_uri.host.to_s.split(".", 2).last
+                  location_host = location_uri.host.to_s.split(".", 2).last
+                  if !redirect_notify && location_host != source_host && !SILENCED_HOSTS.include?(location_host)
+                    ui.clear_line
+                    ui.detail "Download redirected to host: #{location_uri.host}"
+                  end
+                  redirect_notify = true
+                end
+              end
+              progress_data.replace("")
+              break
+            end
+            # If we have a full amount of column data (two "\r") then
+            # we report new progress reports. Otherwise, just keep
+            # accumulating.
+            match = nil
+            check_match = true
+
+            while check_match
+              check_match = progress_regexp.match(progress_data)
+              if check_match
+                data = check_match[1].to_s
+                stop = progress_data.index(data) + data.length
+                progress_data.slice!(0, stop)
+
+                match = check_match
+              end
+            end
+
+            break if !match
+
+            # Ignore the first \r and split by whitespace to grab the columns
+            columns = data.strip.split(/\s+/)
+
+            # COLUMN DATA:
+            #
+            # 0 - % total
+            # 1 - Total size
+            # 2 - % received
+            # 3 - Received size
+            # 4 - % transferred
+            # 5 - Transferred size
+            # 6 - Average download speed
+            # 7 - Average upload speed
+            # 9 - Total time
+            # 9 - Time spent
+            # 10 - Time left
+            # 11 - Current speed
+
+            output = "Progress: #{columns[0]}% (Rate: #{columns[11]}/s, Estimated time remaining: #{columns[10]})"
+            ui.clear_line
+            ui.detail(output, new_line: false)
+          end
+        end
+
+        return data_proc
+      end
+    end
+  end
+end

data/lib/vagrant/util/downloader.rb

@@ -6,6 +6,7 @@ require "digest/sha1"
 require "vagrant/util/busy"
 require "vagrant/util/platform"
 require "vagrant/util/subprocess"
+require "vagrant/util/curl_helper"
 
 module Vagrant
   module Util
@@ -88,85 +89,7 @@ module Vagrant
           # tell us output so we can parse it out.
           extra_subprocess_opts[:notify] = :stderr
 
-          progress_data = ""
-          progress_regexp = /^\r\s*(\d.+?)\r/m
-
-          # Setup the proc that'll receive the real-time data from
-          # the downloader.
-          data_proc = Proc.new do |type, data|
-            # Type will always be "stderr" because that is the only
-            # type of data we're subscribed for notifications.
-
-            # Accumulate progress_data
-            progress_data << data
-
-            while true
-              # If the download has been redirected and we are no longer downloading
-              # from the original host, notify the user that the target host has
-              # changed from the source.
-              if progress_data.include?("Location")
-                location = progress_data.scan(/(^|[^\w-])Location: (.+?)$/m).flatten.compact.last.to_s.strip
-                if !location.empty?
-                  location_uri = URI.parse(location)
-
-                  unless location_uri.host.nil?
-                    @logger.info("download redirected to #{location}")
-                    source_uri = URI.parse(source)
-                    source_host = source_uri.host.to_s.split(".", 2).last
-                    location_host = location_uri.host.to_s.split(".", 2).last
-                    if !@redirect_notify && location_host != source_host && !SILENCED_HOSTS.include?(location_host)
-                      @ui.clear_line
-                      @ui.detail "Download redirected to host: #{location_uri.host}"
-                    end
-                    @redirect_notify = true
-                  end
-                end
-                progress_data.replace("")
-                break
-              end
-
-              # If we have a full amount of column data (two "\r") then
-              # we report new progress reports. Otherwise, just keep
-              # accumulating.
-              match = nil
-              check_match = true
-
-              while check_match
-                check_match = progress_regexp.match(progress_data)
-                if check_match
-                  data = check_match[1].to_s
-                  stop = progress_data.index(data) + data.length
-                  progress_data.slice!(0, stop)
-
-                  match = check_match
-                end
-              end
-
-              break if !match
-
-              # Ignore the first \r and split by whitespace to grab the columns
-              columns = data.strip.split(/\s+/)
-
-              # COLUMN DATA:
-              #
-              # 0 - % total
-              # 1 - Total size
-              # 2 - % received
-              # 3 - Received size
-              # 4 - % transferred
-              # 5 - Transferred size
-              # 6 - Average download speed
-              # 7 - Average upload speed
-              # 9 - Total time
-              # 9 - Time spent
-              # 10 - Time left
-              # 11 - Current speed
-
-              output = "Progress: #{columns[0]}% (Rate: #{columns[11]}/s, Estimated time remaining: #{columns[10]})"
-              @ui.clear_line
-              @ui.detail(output, new_line: false)
-            end
-          end
+          data_proc = Vagrant::Util::CurlHelper.capture_output_proc(@logger, @ui, @source)
         end
 
         @logger.info("Downloader starting download: ")

data/lib/vagrant/util/guest_inspection.rb

@@ -17,39 +17,52 @@ module Vagrant
 
         # systemd-networkd.service is in use
         #
+        # @param [Vagrant::Plugin::V2::Communicator] comm Guest communicator
         # @return [Boolean]
         def systemd_networkd?(comm)
-          comm.test("sudo systemctl status systemd-networkd.service")
+          comm.test("systemctl -q is-active systemd-networkd.service", sudo: true)
+        end
+
+        # Check if given service is controlled by systemd
+        #
+        # @param [Vagrant::Plugin::V2::Communicator] comm Guest communicator
+        # @param [String] service_name Name of the service to check
+        # @return [Boolean]
+        def systemd_controlled?(comm, service_name)
+          comm.test("systemctl -q is-active #{service_name}", sudo: true)
         end
 
         # systemd hostname set is via hostnamectl
         #
+        # @param [Vagrant::Plugin::V2::Communicator] comm Guest communicator
         # @return [Boolean]
         def hostnamectl?(comm)
-          comm.test("hostnamectl")
+          comm.test("command -v hostnamectl")
         end
 
         ## netplan helpers
 
         # netplan is installed
         #
+        # @param [Vagrant::Plugin::V2::Communicator] comm Guest communicator
         # @return [Boolean]
         def netplan?(comm)
-          comm.test("netplan -h")
+          comm.test("command -v netplan")
         end
 
         ## nmcli helpers
 
         # nmcli is installed
         #
+        # @param [Vagrant::Plugin::V2::Communicator] comm Guest communicator
         # @return [Boolean]
         def nmcli?(comm)
-          comm.test("nmcli -t")
+          comm.test("command -v nmcli")
         end
 
         # NetworkManager currently controls device
         #
-        # @param comm [Communicator]
+        # @param [Vagrant::Plugin::V2::Communicator] comm Guest communicator
         # @param device_name [String]
         # @return [Boolean]
         def nm_controlled?(comm, device_name)