vagrant-zones 0.1.70 → 0.1.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf7f2d51ab8e038a7346aeff1ce52039e977e173188d7d18e1686b46d75bc9cb
-  data.tar.gz: 0fbdc3639297fe146af42a13aa48f0fb4875ef14a722d2bd1943dc2f9c6e8d17
+  metadata.gz: c3391538892bf880e5476438343dfe9558e2d2afee2251c7dc7221c5cea723ac
+  data.tar.gz: f2bed0db576707651f752b39c108d89578e26a9c78699b1f1c307753eaf8893f
 SHA512:
-  metadata.gz: 262811c3d2d50b6e7e5f506bd3326331bdaafa11aeb2b2fc0f7c3de5f25034faa07988ff46bfeeea72fc78b994988a8d1c19546468f1a772882266272d1e0d72
-  data.tar.gz: 4a83da44cb68784fddb29042545e9ac31017cdc2d8fa30ee2a5346dd481111867b01360c2138f507b829d5fe61322947c7e1ac3e1590481991e6137355b6dbb1
+  metadata.gz: 74d0fdb3193c2a59c086b77522644ba6f945623158eef7a56556a7b7ff92e05a8be286681d133bbc784de161c45cc6a5023b840c901bb2e8302f759b236a6d01
+  data.tar.gz: c8a2981bc239b412029ec27f0a6650ae9e78d809f9cd3a4bad3fc1c7bcd9f74e7993fcb9bf3ae9ec6a6fceb6af5769ec41766a3ad8bae98729623a837fafe189

data/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## [0.1.72](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.71...v0.1.72) (2023-02-06)
+
+
+### Bug Fixes
+
+* confirmation push ([8518bd1](https://github.com/STARTcloud/vagrant-zones/commit/8518bd11139ce3ff7433135a59cfedad07702b0a))
+* dhcp, gatherip, root home ([a6458be](https://github.com/STARTcloud/vagrant-zones/commit/a6458befefb2d4092cf1080904da48bb863d3d92))
+* lint a little ([a46728b](https://github.com/STARTcloud/vagrant-zones/commit/a46728b549b2a078c1d61a65ce3fcfe47c1f609f))
+* lint a little more ([1106aa4](https://github.com/STARTcloud/vagrant-zones/commit/1106aa44cbf43aafc483427c4850b216438cf327))
+* lint a little more ([0a66c99](https://github.com/STARTcloud/vagrant-zones/commit/0a66c99f6846a4527467f9e2d7273e8554acc259))
+* unassisted dhcp ([917e713](https://github.com/STARTcloud/vagrant-zones/commit/917e713cd82db591c28f46453912dd6aef45edae))
+* unassisted dhcp ([9e55438](https://github.com/STARTcloud/vagrant-zones/commit/9e55438020f6c0d203298a2066cedae6013a15a2))
+* unassisted dhcp ([1501a9a](https://github.com/STARTcloud/vagrant-zones/commit/1501a9a04136c204e47ef283d016fec3179e067b))
+* unassisted dhcp ([b24b784](https://github.com/STARTcloud/vagrant-zones/commit/b24b784e2fad31566467358b30c98338257ceab5))
+* unassisted dhcp ([866660c](https://github.com/STARTcloud/vagrant-zones/commit/866660ce249d2fee6a87c61318012dc8befe48a2))
+* unassisted dhcp ([130e4d3](https://github.com/STARTcloud/vagrant-zones/commit/130e4d369503f0130e56d3947bae5d2ef2754b19))
+* unassisted dhcp ([f3faed4](https://github.com/STARTcloud/vagrant-zones/commit/f3faed405f6a75432bab84d2fb3eec1d4f62c23f))
+
+## [0.1.71](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.70...v0.1.71) (2023-02-04)
+
+
+### Bug Fixes
+
+* dhcp netplan ([aaebea7](https://github.com/STARTcloud/vagrant-zones/commit/aaebea7d0794eec2d9ad3f6b8b1e85f7d79f8b5f))
+* lint ([9d9c5e6](https://github.com/STARTcloud/vagrant-zones/commit/9d9c5e625608a697f142458a4ca8d2425c916dfa))
+
 ## [0.1.70](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.69...v0.1.70) (2023-01-17)
 
 

data/lib/vagrant-zones/driver.rb

@@ -82,7 +82,7 @@ module VagrantPlugins
         config = @machine.provider_config
         uii.info(I18n.t('vagrant_zones.control')) if config.debug
         case control
-        when 'restart'
+        when 'rmatch(/estart'
           command = 'sudo shutdown -r'
           command = config.safe_restart unless config.safe_restart.nil?
           ssh_run_command(uii, command)
@@ -98,7 +98,7 @@ module VagrantPlugins
       ## Run commands over SSH instead of ZLogin
       def ssh_run_command(uii, command)
         config = @machine.provider_config
-        ip = get_ip_address('runsshcommmand')
+        ip = get_ip_address(uii)
         user = user(@machine)
         key = userprivatekeypath(@machine).to_s
         port = sshport(@machine).to_s
@@ -258,33 +258,52 @@ module VagrantPlugins
       end
 
       ## If DHCP and Zlogin, get the IP address
-      def get_ip_address(_function)
+      def get_ip_address(_uii)
         config = @machine.provider_config
         name = @machine.name
+        lcheck = config.lcheck
+        lcheck = ':~' if config.lcheck.nil?
+        alcheck = config.alcheck
+        alcheck = 'login:' if config.alcheck.nil?
+        pcheck = 'Password:'
+
         @machine.config.vm.networks.each do |_adaptertype, opts|
-          responses = []
-          nic_type = nictype(opts)
+          ip = nil
           if opts[:dhcp4] && opts[:managed]
-            vnic_name = "vnic#{nic_type}#{vtype(config)}_#{config.partition_id}_#{opts[:nic_number]}"
+            vnic_name = "vnic#{nictype(opts)}#{vtype(config)}_#{config.partition_id}_#{opts[:nic_number]}"
             PTY.spawn("pfexec zlogin -C #{name}") do |zlogin_read, zlogin_write, pid|
-              command = "ip -4 addr show dev #{vnic_name} | head -n -1 | tail -1 | awk '{ print $2 }' | cut -f1 -d\"/\" \n"
-              zlogin_read.expect(/\n/) { zlogin_write.printf(command) }
-              Timeout.timeout(config.clean_shutdown_time) do
+              Timeout.timeout(config.setup_wait) do
+                rsp = []
+                command = "ip -4 addr show dev #{vnic_name} | grep -Po 'inet \\K[\\d.]+' \r\n"
+                i = 0
+                logged_in = false
                 loop do
-                  zlogin_read.expect(/\r\n/) { |line| responses.push line }
-                  if responses[-1].to_s.match(/(?:[0-9]{1,3}\.){3}[0-9]{1,3}/)
-                    ip = responses[-1][0].rstrip.gsub(/\e\[\?2004l/, '').lstrip
-                    return nil if ip.empty?
-                    return ip.gsub(/\t/, '') unless ip.empty?
+                  zlogin_read.expect(/\r\n/) { |line| rsp.push line }
+                  logged_in = true if rsp[-1].to_s.match(/(#{Regexp.quote(lcheck)})/) || rsp[-1].to_s.match(/(:~)/)
+                  zlogin_write.printf("\r\n") if i < 1
+                  i += 1
 
-                    break
-                  end
-                  errormessage = "==> #{name} ==> Command ==> #{command} \nFailed with ==> #{responses[-1]}"
-                  raise errormessage if responses[-1].to_s.match(/Error Code: \b(?!0\b)\d{1,4}\b/)
+                  break if logged_in || rsp[-1].to_s.match(/(#{Regexp.quote(alcheck)})/)
                 end
+
+                unless logged_in
+                  zlogin_write.printf("#{user(@machine)}\n") if zlogin_read.expect(/#{Regexp.quote(alcheck)}/)
+                  zlogin_write.printf("#{vagrantuserpass(@machine)}\n") if zlogin_read.expect(/#{Regexp.quote(pcheck)}/)
+                  logged_in = true if zlogin_read.expect(/#{Regexp.quote(lcheck)}/)
+                end
+
+                puts 'Gathering IP' if config.debug_boot
+                zlogin_write.printf(command) if logged_in
+                loop do
+                  zlogin_read.expect(/\r\n/) { |line| rsp.push line }
+                  ip = rsp[-1].to_s.match(/((?:[0-9]{1,3}\.){3}[0-9]{1,3})/)
+
+                  break if rsp[-1].to_s.match(/((?:[0-9]{1,3}\.){3}[0-9]{1,3})/)
+                end
+                Process.kill('HUP', pid)
               end
-              Process.kill('HUP', pid)
             end
+            return ip[0] unless ip[0].empty? || ip[0].nil?
           elsif (opts[:dhcp4] == false || opts[:dhcp4].nil?) && opts[:managed]
             ip = opts[:ip].to_s
             return nil if ip.empty?
@@ -1063,8 +1082,10 @@ module VagrantPlugins
         uii.info(I18n.t('vagrant_zones.configure_interface_using_vnic'))
         uii.info("  #{vnic_name}")
         netplan1 = %(network:\n  version: 2\n  ethernets:\n    #{vnic_name}:\n      match:\n        macaddress: #{mac}\n)
-        netplan2 = %(      dhcp-identifier: mac\n      dhcp4: #{opts[:dhcp4]}\n      dhcp6: #{opts[:dhcp6]}\n)
+        netplan2 = ''
+        netplan2 = %(      dhcp-identifier: mac\n      dhcp4: #{opts[:dhcp4]}\n      dhcp6: #{opts[:dhcp6]}\n) if opts[:dhcp4]
         netplan3 = %(      set-name: #{vnic_name}\n      addresses: [#{ip}/#{shrtsubnet}]\n)
+        netplan3 = %(      set-name: #{vnic_name}\n) if opts[:dhcp4]
         netplan4 = %(      gateway4: #{defrouter}\n)
         netplan5 = %(      nameservers:\n        addresses: [#{servers[0]['nameserver']} , #{servers[1]['nameserver']}] )
         netplan = netplan1 + netplan2 + netplan3 + netplan5 if opts[:gateway].nil?
@@ -1185,7 +1206,7 @@ module VagrantPlugins
             zlogin_write.printf("\n")
             if zlogin_read.expect(/#{lcheck}/)
               uii.info(I18n.t('vagrant_zones.automated-zlogin-root'))
-              zlogin_write.printf("sudo su\n")
+              zlogin_write.printf("sudo su -\n")
               sleep(config.login_wait)
               Process.kill('HUP', pid)
             end

data/lib/vagrant-zones/version.rb

@@ -2,7 +2,7 @@
 
 module VagrantPlugins
   module ProviderZone
-    VERSION = '0.1.70'
+    VERSION = '0.1.72'
     NAME = 'vagrant-zones'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-zones
 version: !ruby/object:Gem::Version
-  version: 0.1.70
+  version: 0.1.72
 platform: ruby
 authors:
 - Mark Gilbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-17 00:00:00.000000000 Z
+date: 2023-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n