change_host_name.rb in vagrant-unbundled-2.2.2.0

- old
+ new

@@ -1,23 +1,25 @@
+require "log4r"
+require_relative "../../linux/cap/network_interfaces"
+
 module VagrantPlugins
   module GuestDebian
     module Cap
       class ChangeHostName
+
+        extend Vagrant::Util::GuestInspection::Linux
+
         def self.change_host_name(machine, name)
+          @logger = Log4r::Logger.new("vagrant::guest::debian::changehostname")
           comm = machine.communicate
 
           if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
             basename = name.split(".", 2)[0]
             comm.sudo <<-EOH.gsub(/^ {14}/, '')
               # Set the hostname
               echo '#{basename}' > /etc/hostname
-              hostname -F /etc/hostname
 
-              if command -v hostnamectl; then
-                hostnamectl set-hostname '#{basename}'
-              fi
-
               # Prepend ourselves to /etc/hosts
               grep -w '#{name}' /etc/hosts || {
                 if grep -w '^127\\.0\\.1\\.1' /etc/hosts ; then
                   sed -i'' 's/^127\\.0\\.1\\.1\\s.*$/127.0.1.1\\t#{name}\\t#{basename}/' /etc/hosts
                 else
@@ -26,22 +28,76 @@
               }
 
               # Update mailname
               echo '#{name}' > /etc/mailname
 
+            EOH
+
+            if hostnamectl?(comm)
+              comm.sudo("hostnamectl set-hostname '#{basename}'")
+            else
+              comm.sudo <<-EOH.gsub(/^ {14}/, '')
+              hostname -F /etc/hostname
               # Restart hostname services
               if test -f /etc/init.d/hostname; then
                 /etc/init.d/hostname start || true
               fi
 
               if test -f /etc/init.d/hostname.sh; then
                 /etc/init.d/hostname.sh start || true
               fi
-              if test -x /sbin/dhclient ; then
-                /sbin/dhclient -r
-                /sbin/dhclient -nw
-              fi
-            EOH
+              EOH
+            end
+
+            restart_command = nil
+            if systemd?(comm)
+              if systemd_networkd?(comm)
+                @logger.debug("Attempting to restart networking with systemd-networkd")
+                restart_command = "systemctl restart systemd-networkd.service"
+              elsif systemd_controlled?(comm, "NetworkManager.service")
+                @logger.debug("Attempting to restart networking with NetworkManager")
+                restart_command = "systemctl restart NetworkManager.service"
+              end
+            end
+
+            if restart_command
+              comm.sudo(restart_command)
+            else
+              restart_each_interface(machine, @logger)
+            end
+          end
+        end
+
+        protected
+
+        # Due to how most Debian systems and older Ubuntu systems handle restarting
+        # networking, we cannot simply run the networking init script or use the ifup/down
+        # tools to restart all interfaces to renew the machines DHCP lease when setting
+        # its hostname. This method is a workaround for those older systems that
+        # cannoy reliably restart networking. It restarts each individual interface
+        # on its own instead.
+        #
+        # @param [Vagrant::Machine] machine
+        # @param [Log4r::Logger] logger
+        def self.restart_each_interface(machine, logger)
+          comm = machine.communicate
+          interfaces = VagrantPlugins::GuestLinux::Cap::NetworkInterfaces.network_interfaces(machine)
+          nettools = true
+          if systemd?(comm)
+            @logger.debug("Attempting to restart networking with systemctl")
+            nettools = false
+          else
+            @logger.debug("Attempting to restart networking with ifup/down nettools")
+          end
+
+          interfaces.each do |iface|
+            logger.debug("Restarting interface #{iface} on guest #{machine.name}")
+            if nettools
+             restart_command = "ifdown #{iface};ifup #{iface}"
+            else
+             restart_command = "systemctl stop ifup@#{iface}.service;systemctl start ifup@#{iface}.service"
+            end
+            comm.sudo(restart_command)
           end
         end
       end
     end
   end