Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

docs: correct brand name #204

Merged
merged 1 commit into from
Jun 28, 2024
Merged

docs: correct brand name #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .web-docs/components/builder/iso/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,8 +722,8 @@ provisioner](/packer/docs/provisioner/file).
need to connect to the console to debug the build process.
Some users have experienced issues where Packer cannot properly connect
to a VM if it is headless; this appears to be a result of not ever having
launched the VMWare GUI and accepting the evaluation license, or
supplying a real license. If you experience this, launching VMWare and
launched the VMware GUI and accepting the evaluation license, or
supplying a real license. If you experience this, launching VMware and
accepting the license should resolve your problem.

- `vnc_bind_address` (string) - The IP address that should be
Expand Down Expand Up @@ -773,7 +773,7 @@ provisioner](/packer/docs/provisioner/file).

- `tools_source_path` (string) - The path on your local machine to fetch the vmware tools from. If this
is not set but the tools_upload_flavor is set, then Packer will try to
load the VMWare tools from the VMWare installation directory.
load the VMware tools from the VMware installation directory.

<!-- End of code generated from the comments of the ToolsConfig struct in builder/vmware/common/tools_config.go; -->

Expand Down Expand Up @@ -1278,7 +1278,7 @@ variables isn't required, however.
- `GuestOS` - The VMware-valid guest OS type.
- `DiskName` - The filename (without the suffix) of the main virtual disk.
- `ISOPath` - The path to the ISO to use for the OS installation.
- `Version` - The Hardware version VMWare will execute this vm under. Also
- `Version` - The Hardware version VMware will execute this vm under. Also
known as the `virtualhw.version`.

## Building on a Remote vSphere Hypervisor
Expand Down
6 changes: 3 additions & 3 deletions .web-docs/components/builder/vmx/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,8 +472,8 @@ boot time.
need to connect to the console to debug the build process.
Some users have experienced issues where Packer cannot properly connect
to a VM if it is headless; this appears to be a result of not ever having
launched the VMWare GUI and accepting the evaluation license, or
supplying a real license. If you experience this, launching VMWare and
launched the VMware GUI and accepting the evaluation license, or
supplying a real license. If you experience this, launching VMware and
accepting the license should resolve your problem.

- `vnc_bind_address` (string) - The IP address that should be
Expand Down Expand Up @@ -571,7 +571,7 @@ boot time.

- `tools_source_path` (string) - The path on your local machine to fetch the vmware tools from. If this
is not set but the tools_upload_flavor is set, then Packer will try to
load the VMWare tools from the VMWare installation directory.
load the VMware tools from the VMware installation directory.

<!-- End of code generated from the comments of the ToolsConfig struct in builder/vmware/common/tools_config.go; -->

Expand Down
4 changes: 2 additions & 2 deletions builder/vmware/common/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ func (d *VmwareDriver) PotentialGuestIP(state multistep.StateBag) ([]string, err

// First check for leases that are still valid. The timestamp for
// each lease should be in UTC according to the documentation at
// the top of VMWare's dhcpd.leases file.
// the top of VMware's dhcpd.leases file.
now := time.Now().UTC()
if !(now.After(entry.starts) && now.Before(entry.ends)) {
continue
Expand Down Expand Up @@ -434,7 +434,7 @@ func (d *VmwareDriver) PotentialGuestIP(state multistep.StateBag) ([]string, err

if runtime.GOOS == "darwin" {
// We have match no vmware DHCP lease for this MAC. We'll try to match it in Apple DHCP leases.
// As a remember, VMWare is no longer able to rely on its own dhcpd server on MacOS BigSur and is
// As a remember, VMware is no longer able to rely on its own dhcpd server on MacOS BigSur and is
// forced to use Apple DHCPD server instead.
// https://communities.vmware.com/t5/VMware-Fusion-Discussions/Big-Sur-hosts-with-Fusion-Is-vmnet-dhcpd-vmnet8-leases-file/m-p/2298927/highlight/true#M140003

Expand Down
6 changes: 3 additions & 3 deletions builder/vmware/common/driver_player_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func playerDhcpLeasesPath(device string) string {
}
}

log.Printf("Error finding VMWare DHCP Server Leases (dhcpd.leases) under device path: %s", devicebase)
log.Printf("Error finding VMware DHCP Server Leases (dhcpd.leases) under device path: %s", devicebase)
return ""
}

Expand All @@ -91,7 +91,7 @@ func playerVmDhcpConfPath(device string) string {
}
}

log.Printf("Error finding VMWare DHCP Server Configuration (dhcp.conf) under device path: %s", devicebase)
log.Printf("Error finding VMware DHCP Server Configuration (dhcp.conf) under device path: %s", devicebase)
return ""
}

Expand Down Expand Up @@ -134,7 +134,7 @@ func playerVerifyVersion(version string) error {
if matches == nil {
return fmt.Errorf("error parsing version output: %s", stderr.String())
}
log.Printf("Detected VMWare Player version: %s", matches[1])
log.Printf("Detected VMware Player version: %s", matches[1])

return compareVersions(matches[1], version, "Player")
}
4 changes: 2 additions & 2 deletions builder/vmware/common/driver_workstation_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func workstationDhcpLeasesPath(device string) string {
}
}

log.Printf("Error finding VMWare DHCP Server Leases (dhcpd.leases) under device path: %s", devicebase)
log.Printf("Error finding VMware DHCP Server Leases (dhcpd.leases) under device path: %s", devicebase)
return ""
}

Expand All @@ -97,7 +97,7 @@ func workstationDhcpConfPath(device string) string {
}
}

log.Printf("Error finding VMWare DHCP Server Configuration (dhcp.conf) under device path: %s", devicebase)
log.Printf("Error finding VMware DHCP Server Configuration (dhcp.conf) under device path: %s", devicebase)
return ""
}

Expand Down
1 change: 0 additions & 1 deletion builder/vmware/common/hw_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ func (c *HWConfig) Prepare(ctx *interpolate.Context) []error {
return errs
}

/* parallel port */
type ParallelUnion struct {
Union interface{}
File *ParallelPortFile
Expand Down
4 changes: 2 additions & 2 deletions builder/vmware/common/run_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ type RunConfig struct {
// need to connect to the console to debug the build process.
// Some users have experienced issues where Packer cannot properly connect
// to a VM if it is headless; this appears to be a result of not ever having
// launched the VMWare GUI and accepting the evaluation license, or
// supplying a real license. If you experience this, launching VMWare and
// launched the VMware GUI and accepting the evaluation license, or
// supplying a real license. If you experience this, launching VMware and
// accepting the license should resolve your problem.
Headless bool `mapstructure:"headless" required:"false"`
// The IP address that should be
Expand Down
4 changes: 2 additions & 2 deletions builder/vmware/common/step_configure_vmx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,9 @@ func (s *StepConfigureVMX) Run(ctx context.Context, state multistep.StateBag) mu
}

// Set the extendedConfigFile setting for the .vmxf filename to the VMName
// if displayName is not set. This is needed so that when VMWare creates
// if displayName is not set. This is needed so that when VMware creates
// the .vmxf file it matches the displayName if it is set. When just using
// the sisplayName if it was empty VMWare would make a file named ".vmxf".
// the sisplayName if it was empty VMware would make a file named ".vmxf".
// The ".vmxf" file would not get deleted when the VM got deleted.
if s.DisplayName != "" {
vmxData["extendedconfigfile"] = fmt.Sprintf("%s.vmxf", s.DisplayName)
Expand Down
4 changes: 2 additions & 2 deletions builder/vmware/common/step_shutdown.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ LockWaitLoop:
if !s.Testing {
// Windows takes a while to yield control of the files when the
// process is exiting. Ubuntu and OS X will yield control of the files
// but VMWare may overwrite the VMX cleanup steps that run after this,
// so we wait to ensure VMWare has exited and flushed the VMX.
// but VMware may overwrite the VMX cleanup steps that run after this,
// so we wait to ensure VMware has exited and flushed the VMX.

// We just sleep here. In the future, it'd be nice to find a better
// solution to this.
Expand Down
2 changes: 1 addition & 1 deletion builder/vmware/common/tools_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ type ToolsConfig struct {
ToolsUploadPath string `mapstructure:"tools_upload_path" required:"false"`
// The path on your local machine to fetch the vmware tools from. If this
// is not set but the tools_upload_flavor is set, then Packer will try to
// load the VMWare tools from the VMWare installation directory.
// load the VMware tools from the VMware installation directory.
ToolsSourcePath string `mapstructure:"tools_source_path" required:"false"`
}

Expand Down
1 change: 0 additions & 1 deletion builder/vmware/vmx/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
vmwcommon "github.com/hashicorp/packer-plugin-vmware/builder/vmware/common"
)

// Config is the configuration structure for the builder.
type Config struct {
common.PackerConfig `mapstructure:",squash"`
commonsteps.HTTPConfig `mapstructure:",squash"`
Expand Down
5 changes: 0 additions & 5 deletions docs-partials/builder/vmware/common/ParallelUnion.mdx
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions docs-partials/builder/vmware/common/RunConfig-not-required.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
need to connect to the console to debug the build process.
Some users have experienced issues where Packer cannot properly connect
to a VM if it is headless; this appears to be a result of not ever having
launched the VMWare GUI and accepting the evaluation license, or
supplying a real license. If you experience this, launching VMWare and
launched the VMware GUI and accepting the evaluation license, or
supplying a real license. If you experience this, launching VMware and
accepting the license should resolve your problem.

- `vnc_bind_address` (string) - The IP address that should be
Expand Down
5 changes: 0 additions & 5 deletions docs-partials/builder/vmware/common/SerialConfigPipe.mdx
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion docs-partials/builder/vmware/common/ToolsConfig-not-required.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@

- `tools_source_path` (string) - The path on your local machine to fetch the vmware tools from. If this
is not set but the tools_upload_flavor is set, then Packer will try to
load the VMWare tools from the VMWare installation directory.
load the VMware tools from the VMware installation directory.

<!-- End of code generated from the comments of the ToolsConfig struct in builder/vmware/common/tools_config.go; -->
5 changes: 0 additions & 5 deletions docs-partials/builder/vmware/vmx/Config.mdx
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion docs/builders/iso.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ variables isn't required, however.
- `GuestOS` - The VMware-valid guest OS type.
- `DiskName` - The filename (without the suffix) of the main virtual disk.
- `ISOPath` - The path to the ISO to use for the OS installation.
- `Version` - The Hardware version VMWare will execute this vm under. Also
- `Version` - The Hardware version VMware will execute this vm under. Also
known as the `virtualhw.version`.

## Building on a Remote vSphere Hypervisor
Expand Down