vagrant-zones 0.1.97 → 0.1.99

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bc4c0b91b20ad53d95b7d2544e3b6766db2bb65615b5eb0d0e5196d33b7b48d
-  data.tar.gz: 4c134f5570b0e4fca44105f28c91a2b26291862cd5e6358dcab21e40fffadd77
+  metadata.gz: 2597df7f5e76aadf6d3415e4dafe33af5029f0e2c8975e23dbe599d64d0c0755
+  data.tar.gz: 362b02ad488fb43f98d0ca954a3d934fbb247ba684d49ab8aec23f97b09eb60f
 SHA512:
-  metadata.gz: f85d4e203831861888d8359face75ff093ea82702de832b5ade9f10757bbd896bcf60f84b1f8632f766af82415a357a8a82700ef8fa18b17de1fd42f261b3426
-  data.tar.gz: d78d087ce49093fc843a0f1ed4a96d95d9af91451cd8846a76b8e6b02f412b0dabeeed87853ac18f2c6b5e40c7b1e81e57a8aaf5ba26711e4f8be3d3df521bfa
+  metadata.gz: 1c570fc6fc3aa56962c3b6da0ce3d4a95dd78cb5d41dbf27af426a331842e4d6084da3a7dc62a7b897911050fc2a88d4fcbfa6ea0305df408669b1f531b86117
+  data.tar.gz: 0a5f59044ce1e5524fe044858de4757932a05f84341dca3c8eaafcff4e9ab12ce1187c871639d6eba79bfa68577f86ef362affe1c72c138eae42d55926534d68

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [0.1.99](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.98...v0.1.99) (2025-05-04)
+
+
+### Bug Fixes
+
+* null vlans ([ef22b48](https://github.com/STARTcloud/vagrant-zones/commit/ef22b481a3e8293039b371dd49db00f87c71923f))
+* rubocop linting errors ([48530c4](https://github.com/STARTcloud/vagrant-zones/commit/48530c41be5e46123d8773abdf651ff5ca0c879b))
+* rubocop linting errors ([018b555](https://github.com/STARTcloud/vagrant-zones/commit/018b5551eaf64de5e404e6abee32f9257c214f07))
+
+## [0.1.98](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.97...v0.1.98) (2024-10-11)
+
+
+### Bug Fixes
+
+* handle invalid characters in zlogin for alma9 ([94e9784](https://github.com/STARTcloud/vagrant-zones/commit/94e978497537f9d7edf4958e35d2797e328edda2))
+* handle invalid characters in zlogin for alma9 ([a9d5425](https://github.com/STARTcloud/vagrant-zones/commit/a9d542501288eb819eb33aff0930b853a8e8d41c))
+* handle invalid characters in zlogin for alma9 ([9256d12](https://github.com/STARTcloud/vagrant-zones/commit/9256d1223b04ec890fee9dfdea0433b579e3ae26))
+* handle invalid characters in zlogin for alma9 ([67ca751](https://github.com/STARTcloud/vagrant-zones/commit/67ca7515359977eebb345e6730cee7241d8893c2))
+
 ## [0.1.97](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.96...v0.1.97) (2024-08-17)
 
 

data/lib/vagrant-zones/action/import.rb

@@ -66,7 +66,7 @@ module VagrantPlugins
                       ratelimit += 1
                       if ratelimit >= rate
                         uiprogress.clear_line
-                        status = format('%.2f%%', (amount_downloaded.to_f / file_size * 100))
+                        status = format('%.2f%%', amount_downloaded.to_f / file_size * 100)
                         uiprogress.info(I18n.t('vagrant_zones.importing_joyent_image') + "#{image} ==> ", new_line: false)
                         uiprogress.report_progress(status, 100, false)
                         ratelimit = 0

data/lib/vagrant-zones/driver.rb

@@ -727,7 +727,7 @@ module VagrantPlugins
         uii.info(I18n.t('vagrant_zones.creating_vnic'))
         uii.info("  #{vnic_name}")
         command = "#{@pfexec} dladm create-vnic -l #{opts[:bridge]} -m #{mac}"
-        command += " -v #{opts[:vlan]}" unless opts[:vlan].nil? || (opts[:vlan]).zero?
+        command += " -v #{opts[:vlan]}" unless opts[:vlan].nil? || opts[:vlan].zero?
         command += " #{vnic_name}"
         execute(false, command)
       end
@@ -928,9 +928,9 @@ module VagrantPlugins
       ## zonecfg function for CPU Configurations
       def zonecfgcpu(uii, _name, config, zcfg)
         uii.info(I18n.t('vagrant_zones.zonecfgcpu')) if config.debug
-        if config.cpu_configuration == 'simple' && (config.brand == 'bhyve' || config.brand == 'kvm')
+        if config.cpu_configuration == 'simple' && %w[bhyve kvm].include?(config.brand)
           execute(false, %(#{zcfg}"add attr; set name=vcpus; set value=#{config.cpus}; set type=string; end;"))
-        elsif config.cpu_configuration == 'complex' && (config.brand == 'bhyve' || config.brand == 'kvm')
+        elsif config.cpu_configuration == 'complex' && %w[bhyve kvm].include?(config.brand)
           hash = config.complex_cpu_conf[0]
           cstring = %(sockets=#{hash['sockets']},cores=#{hash['cores']},threads=#{hash['threads']})
           execute(false, %(#{zcfg}'add attr; set name=vcpus; set value="#{cstring}"; set type=string; end;'))
@@ -1054,15 +1054,15 @@ module VagrantPlugins
           shrtstr2 = %(add property (name=ips,value="#{allowed_address}"); add property (name=primary,value="true"); end;)
           execute(false, %(#{zonecfg_cmd}set global-nic=auto; #{shrtstr1} #{shrtstr2}"))
         when 'bhyve'
-          vlan_option = opts[:vlan].nil? || opts[:vlan].zero? ? '' : "set vlan-id=#{opts[:vlan]}; "
+          vlan_option = opts[:vlan].nil? || opts[:vlan].zero? ? '' : "set vlan-id=#{opts[:vlan]};"
           base_cmd = if config.on_demand_vnics
-                       %(#{zonecfg_cmd}"add net; set physical=#{vnic_name}; #{vlan_option}set global-nic=#{opts[:bridge]}; )
+                       %(add net; set physical=#{vnic_name}; #{vlan_option} set global-nic=#{opts[:bridge]};)
                      else
-                       %(#{zonecfg_cmd}"add net; set physical=#{vnic_name}; )
+                       %(add net; set physical=#{vnic_name};)
                      end
-          execute(false, %(#{base_cmd}end;)) unless cie
-          execute(false, %(#{base_cmd}set allowed-address=#{allowed_address}; end;)) if cie && aa
-          execute(false, %(#{base_cmd}end;)) if cie && !aa
+          execute(false, %(#{zonecfg_cmd} "#{base_cmd} end;")) unless cie
+          execute(false, %(#{zonecfg_cmd} "#{base_cmd} set allowed-address=#{allowed_address}; end;")) if cie && aa
+          execute(false, %(#{zonecfg_cmd} "#{base_cmd} end;")) if cie && !aa
         end
       end
 
@@ -1129,7 +1129,7 @@ module VagrantPlugins
 
       ## This setups the Netplan based OS Networking via Zlogin
       def zoneniczloginsetup_netplan(uii, opts, mac)
-        zlogin(uii, 'rm -rf /etc/netplan/*.yaml') if (opts[:nic_number]).zero?
+        zlogin(uii, 'rm -rf /etc/netplan/*.yaml') if opts[:nic_number].zero?
         ip = ipaddress(uii, opts)
         vnic_name = vname(uii, opts)
         servers = dnsservers(uii, opts).map { |server| server['nameserver'] }.join(', ') unless opts[:dns].nil?
@@ -1219,31 +1219,45 @@ module VagrantPlugins
       def zloginboot(uii)
         name = @machine.name
         config = @machine.provider_config
-        lcheck = config.lcheck
-        lcheck = ':~' if config.lcheck.nil?
-        alcheck = config.alcheck
-        alcheck = 'login:' if config.alcheck.nil?
-        bstring = ' OK ' if config.booted_string.nil?
-        bstring = config.booted_string unless config.booted_string.nil?
-        zunlockboot = 'Importing ZFS root pool'
-        zunlockboot = config.zunlockboot unless config.zunlockboot.nil?
-        zunlockbootkey = config.zunlockbootkey unless config.zunlockbootkey.nil?
+        lcheck = config.lcheck || ':~'
+        alcheck = config.alcheck || 'login:'
+        bstring = config.booted_string || ' OK '
+        zunlockboot = config.zunlockboot || 'Importing ZFS root pool'
+        zunlockbootkey = config.zunlockbootkey
         pcheck = 'Password:'
+
         uii.info(I18n.t('vagrant_zones.automated-zlogin'))
+
         PTY.spawn("pfexec zlogin -C #{name}") do |zlogin_read, zlogin_write, pid|
           Timeout.timeout(config.setup_wait) do
             rsp = []
 
             loop do
-              zlogin_read.expect(/\r\n/) { |line| rsp.push line }
-              uii.info(rsp[-1]) if config.debug_boot
-              sleep(2) if rsp[-1].to_s.match(/#{zunlockboot}/)
-              zlogin_write.printf("#{zunlockbootkey}\n") if rsp[-1].to_s.match(/#{zunlockboot}/)
-              zlogin_write.printf("\n") if rsp[-1].to_s.match(/#{zunlockboot}/)
-              uii.info(I18n.t('vagrant_zones.automated-zbootunlock')) if rsp[-1].to_s.match(/#{zunlockboot}/)
-              sleep(15) if rsp[-1].to_s.match(/#{bstring}/)
-              zlogin_write.printf("\n") if rsp[-1].to_s.match(/#{bstring}/)
-              break if rsp[-1].to_s.match(/#{bstring}/)
+              begin
+                zlogin_read.expect(/\r\n/) do |line|
+                  line = line.first if line.is_a?(Array)
+                  encoded_line = line.to_s.encode('UTF-8', invalid: :replace, undef: :replace, replace: '')
+                  rsp.push encoded_line unless encoded_line.empty?
+                end
+              rescue ArgumentError
+                # Silently ignore encoding errors
+                next
+              end
+
+              uii.info(rsp[-1]) if config.debug_boot && !rsp.empty?
+
+              if !rsp.empty? && rsp[-1].match(/#{zunlockboot}/)
+                sleep(2)
+                zlogin_write.printf("#{zunlockbootkey}\n") if zunlockbootkey
+                zlogin_write.printf("\n")
+                uii.info(I18n.t('vagrant_zones.automated-zbootunlock'))
+              end
+
+              next unless !rsp.empty? && rsp[-1].match(/#{bstring}/)
+
+              sleep(15)
+              zlogin_write.printf("\n")
+              break
             end
 
             if zlogin_read.expect(/#{alcheck}/)
@@ -1630,7 +1644,7 @@ module VagrantPlugins
         uii.info(I18n.t('vagrant_zones.cron_entries'))
         h = { h: 'hourly', d: 'daily', w: 'weekly', m: 'monthly' }
         h.each do |(_k, d)|
-          next unless opts[:list] == d || opts[:list] == 'all'
+          next unless [d, 'all'].include?(opts[:list])
 
           uii.info(cronjobs[d.to_sym]) unless cronjobs[d.to_sym].nil?
         end
@@ -1645,7 +1659,7 @@ module VagrantPlugins
         h = { h: 'hourly', d: 'daily', w: 'weekly', m: 'monthly' }
         uii.info(I18n.t('vagrant_zones.cron_delete'))
         h.each do |(_k, d)|
-          next unless opts[:delete] == d || opts[:delete] == 'all'
+          next unless [d, 'all'].include?(opts[:delete])
 
           cj = cronjobs[d.to_sym].to_s.gsub('*', '\*')
           rc = "#{rmcr}'#{cj}' | #{sc}"

data/lib/vagrant-zones/version.rb

@@ -2,7 +2,7 @@
 
 module VagrantPlugins
   module ProviderZone
-    VERSION = '0.1.97'
+    VERSION = '0.1.99'
     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.97
+  version: 0.1.99
 platform: ruby
 authors:
 - Mark Gilbert
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-17 00:00:00.000000000 Z
+date: 2025-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -176,7 +176,7 @@ metadata:
   documentation_uri: http://rubydoc.info/gems/vagrant-zones
   source_code_uri: https://github.com/STARTCloud/vagrant-zones
   github_repo: https://github.com/STARTCloud/vagrant-zones
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubygems_version: 3.2.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Vagrant provider plugin to support zones
 test_files: []