vagrant-zones 0.1.96 → 0.1.98

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08790ff565fafcf9be7f4019efe4d7cf0096e37accf7d8c463afeb7adab1ed14'
-  data.tar.gz: ae393608d7eb853c88262466d6b571249a6d1a80133818c92cdf269c38e0bccb
+  metadata.gz: 2d8030de6b60c644966b08811778904fc0aa9d560daffa5fd94e203c9cf4963d
+  data.tar.gz: e51be9e241435f2ba7d545e66b68caad81da09f807b31770e4ce40155ae98e3f
 SHA512:
-  metadata.gz: 73cd100176065cb79599347a5183167904f8db71fe4651db60f72dd67d87d98d62ffad433db78c09c75020c5611137103573ad7e338e68ea46d6fb5a95a1c751
-  data.tar.gz: 7ba74192089545507add98990cd383c8f44b5ba7ecc4d5011613f8c9067b6ee2d41aaa805d564724e38382710a1ac25f728581d13e96e43ed1873319c99be3ab
+  metadata.gz: a69de6c69df04f0a5797e00fe72cef4c428750a8111d93a0e95667a151a7e32d93a12b05b2fecf8a1a42ffa5fa8ae96c130d876a86a80ba2920e7564ccda52bf
+  data.tar.gz: 3fe3fbcaee6edee3a4cc1eb2be647bcd98e95cba1b5b5a1b632750855a331a58cca2524bdfa9b30ae3ec8c32043067e81951ee0cb9edf0f2e7f7bcf9c99b77be

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # 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)
+
+
+### Bug Fixes
+
+* add destroy confirmation ([f04e30a](https://github.com/STARTcloud/vagrant-zones/commit/f04e30a3d522dd34568fe99ce6199ae771570b4b))
+* it was there all along ([7355e11](https://github.com/STARTcloud/vagrant-zones/commit/7355e11f15d932c92cf6a678dc574414620992de))
+* linting - add destroy confirmation ([35786fc](https://github.com/STARTcloud/vagrant-zones/commit/35786fcd404096362211a2a07b44e901b46cc295))
+* linting - add destroy confirmation ([31d0140](https://github.com/STARTcloud/vagrant-zones/commit/31d0140da06c66100e78fdd9618394d32428130b))
+* linting - add destroy confirmation ([30e0324](https://github.com/STARTcloud/vagrant-zones/commit/30e0324a1b0865574d3adb95f3cffbe6656bdd05))
+
 ## [0.1.96](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.95...v0.1.96) (2024-08-17)
 
 

data/lib/vagrant-zones/action.rb

@@ -6,7 +6,7 @@ require 'log4r'
 module VagrantPlugins
   module ProviderZone
     # Run actions against the machine
-    module Action
+    module Action # rubocop:disable Metrics/ModuleLength
       include Vagrant::Action::Builtin
       @logger = Log4r::Logger.new('vagrant_zones::action')
 
@@ -116,8 +116,17 @@ module VagrantPlugins
       # This is the action that is primarily responsible for completely freeing the resources of the underlying virtual machine.
       def self.action_destroy
         Vagrant::Action::Builder.new.tap do |b|
-          b.use Call, IsCreated do |_env, b2|
-            b2.use Destroy
+          b.use Call, IsCreated do |env1, b2|
+            unless env1[:result]
+              b2.use NotCreated
+              b2.use Call, DestroyConfirm do |env2, b3|
+                b3.use Destroy if env2[:result]
+              end
+              next
+            end
+            b2.use Call, DestroyConfirm do |env2, b3|
+              b3.use Destroy if env2[:result]
+            end
           end
         end
       end

data/lib/vagrant-zones/driver.rb

@@ -315,7 +315,7 @@ module VagrantPlugins
       ## Manage Network Interfaces
       def network(uii, state)
         config = @machine.provider_config
-        uii.info(I18n.t('vagrant_zones.creating_networking_interfaces')) if state == 'create'
+        uii.info(I18n.t('vagrant_zones.creating_networking_interfaces')) if state == 'create' && !config.on_demand_vnics
         @machine.config.vm.networks.each do |adaptertype, opts|
           case adaptertype.to_s
           when 'public_network'
@@ -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.96'
+    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.96
+  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