Skip to content

Commit 9256d12

Browse files
authored
fix: handle invalid characters in zlogin for alma9
1 parent 67ca751 commit 9256d12

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

lib/vagrant-zones/driver.rb

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,38 +1239,39 @@ def zloginboot(uii)
12391239
encoded_line = line.to_s.encode('UTF-8', invalid: :replace, undef: :replace, replace: '')
12401240
rsp.push encoded_line unless encoded_line.empty?
12411241
end
1242-
rescue ArgumentError => e
1242+
rescue ArgumentError
1243+
# Silently ignore encoding errors
12431244
next
12441245
end
1245-
1246+
12461247
uii.info(rsp[-1]) if config.debug_boot && !rsp.empty?
1247-
1248+
12481249
if !rsp.empty? && rsp[-1].match(/#{zunlockboot}/)
12491250
sleep(2)
12501251
zlogin_write.printf("#{zunlockbootkey}\n") if zunlockbootkey
12511252
zlogin_write.printf("\n")
12521253
uii.info(I18n.t('vagrant_zones.automated-zbootunlock'))
12531254
end
1254-
1255+
12551256
if !rsp.empty? && rsp[-1].match(/#{bstring}/)
12561257
sleep(15)
12571258
zlogin_write.printf("\n")
12581259
break
12591260
end
12601261
end
1261-
1262+
12621263
if zlogin_read.expect(/#{alcheck}/)
12631264
uii.info(I18n.t('vagrant_zones.automated-zlogin-user'))
12641265
zlogin_write.printf("#{user(@machine)}\n")
12651266
sleep(config.login_wait)
12661267
end
1267-
1268+
12681269
if zlogin_read.expect(/#{pcheck}/)
12691270
uii.info(I18n.t('vagrant_zones.automated-zlogin-pass'))
12701271
zlogin_write.printf("#{vagrantuserpass(@machine)}\n")
12711272
sleep(config.login_wait)
12721273
end
1273-
1274+
12741275
zlogin_write.printf("\n")
12751276
if zlogin_read.expect(/#{lcheck}/)
12761277
uii.info(I18n.t('vagrant_zones.automated-zlogin-root'))
@@ -1281,6 +1282,7 @@ def zloginboot(uii)
12811282
end
12821283
end
12831284
end
1285+
12841286

12851287
def natloginboot(uii, metrics, interrupted)
12861288
metrics ||= {}

0 commit comments

Comments
 (0)