vagrant-zones 0.1.97 → 0.1.98

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bc4c0b91b20ad53d95b7d2544e3b6766db2bb65615b5eb0d0e5196d33b7b48d
-  data.tar.gz: 4c134f5570b0e4fca44105f28c91a2b26291862cd5e6358dcab21e40fffadd77
+  metadata.gz: 2d8030de6b60c644966b08811778904fc0aa9d560daffa5fd94e203c9cf4963d
+  data.tar.gz: e51be9e241435f2ba7d545e66b68caad81da09f807b31770e4ce40155ae98e3f
 SHA512:
-  metadata.gz: f85d4e203831861888d8359face75ff093ea82702de832b5ade9f10757bbd896bcf60f84b1f8632f766af82415a357a8a82700ef8fa18b17de1fd42f261b3426
-  data.tar.gz: d78d087ce49093fc843a0f1ed4a96d95d9af91451cd8846a76b8e6b02f412b0dabeeed87853ac18f2c6b5e40c7b1e81e57a8aaf5ba26711e4f8be3d3df521bfa
+  metadata.gz: a69de6c69df04f0a5797e00fe72cef4c428750a8111d93a0e95667a151a7e32d93a12b05b2fecf8a1a42ffa5fa8ae96c130d876a86a80ba2920e7564ccda52bf
+  data.tar.gz: 3fe3fbcaee6edee3a4cc1eb2be647bcd98e95cba1b5b5a1b632750855a331a58cca2524bdfa9b30ae3ec8c32043067e81951ee0cb9edf0f2e7f7bcf9c99b77be

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [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/driver.rb

@@ -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}/)

data/lib/vagrant-zones/version.rb

@@ -2,7 +2,7 @@
 
 module VagrantPlugins
   module ProviderZone
-    VERSION = '0.1.97'
+    VERSION = '0.1.98'
     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.98
 platform: ruby
 authors:
 - Mark Gilbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-17 00:00:00.000000000 Z
+date: 2024-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n