When specifying NONE for serial or parallel in the VMware builder, disable the serial and parallel port devices entirely.

This commit is contained in:
Ali Rizvi-Santiago 2017-04-13 20:01:10 -05:00
parent 258804106b
commit 58ebc5c9a5

View File

@ -404,7 +404,9 @@ func (s *stepCreateVMX) Run(_ context.Context, state multistep.StateBag) multist
state.Put("vmnetwork", network) state.Put("vmnetwork", network)
/// check if serial port has been configured /// check if serial port has been configured
if config.Serial != "" { if config.Serial == "" {
templateData.Serial_Present = "FALSE"
} else {
serial, err := unformat_serial(config.Serial) serial, err := unformat_serial(config.Serial)
if err != nil { if err != nil {
err := fmt.Errorf("Error procesing VMX template: %s", err) err := fmt.Errorf("Error procesing VMX template: %s", err)
@ -439,6 +441,7 @@ func (s *stepCreateVMX) Run(_ context.Context, state multistep.StateBag) multist
templateData.Serial_Yield = serial.auto.yield templateData.Serial_Yield = serial.auto.yield
templateData.Serial_Auto = "TRUE" templateData.Serial_Auto = "TRUE"
case nil: case nil:
templateData.Serial_Present = "FALSE"
break break
default: default:
@ -450,7 +453,9 @@ func (s *stepCreateVMX) Run(_ context.Context, state multistep.StateBag) multist
} }
/// check if parallel port has been configured /// check if parallel port has been configured
if config.Parallel != "" { if config.Parallel == "" {
templateData.Parallel_Present = "FALSE"
} else {
parallel, err := unformat_parallel(config.Parallel) parallel, err := unformat_parallel(config.Parallel)
if err != nil { if err != nil {
err := fmt.Errorf("Error procesing VMX template: %s", err) err := fmt.Errorf("Error procesing VMX template: %s", err)
@ -473,6 +478,7 @@ func (s *stepCreateVMX) Run(_ context.Context, state multistep.StateBag) multist
templateData.Parallel_Auto = "TRUE" templateData.Parallel_Auto = "TRUE"
templateData.Parallel_Bidirectional = parallel.auto.bidirectional templateData.Parallel_Bidirectional = parallel.auto.bidirectional
case nil: case nil:
templateData.Parallel_Present = "FALSE"
break break
default: default: