Tidy UI output on create (#1643)

Skip emitting items that are not set by default where possible.
This commit is contained in:
Darragh Bailey 2022-10-13 16:00:12 +01:00 committed by GitHub
parent e87de89855
commit 1048e72dac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions

View File

@ -243,9 +243,11 @@ module VagrantPlugins
unless @shares.nil?
env[:ui].info(" -- Shares: #{@shares}")
end
env[:ui].info(" -- Management MAC: #{@management_network_mac}")
env[:ui].info(" -- Loader: #{@loader}")
env[:ui].info(" -- Nvram: #{@nvram}")
env[:ui].info(" -- Management MAC: #{@management_network_mac}") if @management_network_mac
env[:ui].info(" -- Kernel: #{@kernel}") if @kernel
env[:ui].info(" -- Initrd: #{@initrd}") if @initrd
env[:ui].info(" -- Loader: #{@loader}") if @loader
env[:ui].info(" -- Nvram: #{@nvram}") if @nvram
if env[:machine].config.vm.box
env[:ui].info(" -- Base box: #{env[:machine].box.name}")
end
@ -260,8 +262,6 @@ module VagrantPlugins
env[:ui].info(" -- Disk driver opts: cache='#{@domain_volume_cache}'")
end
env[:ui].info(" -- Kernel: #{@kernel}")
env[:ui].info(" -- Initrd: #{@initrd}")
env[:ui].info(" -- Graphics Type: #{@graphics_type}")
if !@graphics_autoport
env[:ui].info(" -- Graphics Port: #{@graphics_port}")
@ -271,14 +271,14 @@ module VagrantPlugins
env[:ui].info(" -- Video Type: #{@video_type}")
env[:ui].info(" -- Video VRAM: #{@video_vram}")
env[:ui].info(" -- Video 3D accel: #{@video_accel3d}")
env[:ui].info(" -- Sound Type: #{@sound_type}")
env[:ui].info(" -- Sound Type: #{@sound_type}") if @sound_type
env[:ui].info(" -- Keymap: #{@keymap}")
env[:ui].info(" -- TPM Backend: #{@tpm_type}")
if @tpm_type == 'emulator'
env[:ui].info(" -- TPM Model: #{@tpm_model}")
env[:ui].info(" -- TPM Version: #{@tpm_version}")
else
env[:ui].info(" -- TPM Path: #{@tpm_path}")
env[:ui].info(" -- TPM Path: #{@tpm_path}") if @tpm_path
end
unless @sysinfo.empty?

View File

@ -953,7 +953,7 @@ module VagrantPlugins
@volume_cache = nil if @volume_cache == UNSET_VALUE
@kernel = nil if @kernel == UNSET_VALUE
@cmd_line = '' if @cmd_line == UNSET_VALUE
@initrd = '' if @initrd == UNSET_VALUE
@initrd = nil if @initrd == UNSET_VALUE
@dtb = nil if @dtb == UNSET_VALUE
@graphics_type = 'vnc' if @graphics_type == UNSET_VALUE
@graphics_autoport = @graphics_type != 'spice' && @graphics_port == UNSET_VALUE ? 'yes' : nil