iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move the hyperv-only powershell dependency into the hyperv subdirectory (#10198)

This commit is contained in:
Megan Marsh 2020-11-04 06:15:43 -08:00 committed by GitHub
parent 8b5e2903b9
commit d8fec2e9e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builder/hyperv/common/config.go
View File

@ -8,9 +8,9 @@ import (
"os"
"strings"
powershell "github.com/hashicorp/packer/builder/hyperv/common/powershell"
"github.com/hashicorp/packer/builder/hyperv/common/powershell/hyperv"
"github.com/hashicorp/packer/common"
powershell "github.com/hashicorp/packer/common/powershell"
"github.com/hashicorp/packer/common/powershell/hyperv"
"github.com/hashicorp/packer/template/interpolate"
)

4
builder/hyperv/common/driver_ps_4.go
View File

@ -8,8 +8,8 @@ import (
"strconv"
"strings"
"github.com/hashicorp/packer/common/powershell"
"github.com/hashicorp/packer/common/powershell/hyperv"
"github.com/hashicorp/packer/builder/hyperv/common/powershell"
"github.com/hashicorp/packer/builder/hyperv/common/powershell/hyperv"
)
type HypervPS4Driver struct {

4
common/powershell/hyperv/hyperv.go → builder/hyperv/common/powershell/hyperv/hyperv.go
View File

@ -11,7 +11,7 @@ import (
"strings"
"text/template"
"github.com/hashicorp/packer/common/powershell"
"github.com/hashicorp/packer/builder/hyperv/common/powershell"
)
type scriptOptions struct {
@ -194,7 +194,7 @@ func SetFirstBootDeviceGen1(vmName string, controllerType string) error {
script := `
param([string] $vmName, [string] $controllerType)
$vmBootOrder = Hyper-V\Get-VMBios -VMName $vmName | Select-Object -ExpandProperty StartupOrder | Where-Object { $_ -ne $controllerType }
$vmBootOrder = Hyper-V\Get-VMBios -VMName $vmName | Select-Object -ExpandProperty StartupOrder | Where-Object { $_ -ne $controllerType }
Hyper-V\Set-VMBios -VMName $vmName -StartupOrder (@($controllerType) + $vmBootOrder)
`

0
common/powershell/hyperv/hyperv_test.go → builder/hyperv/common/powershell/hyperv/hyperv_test.go
View File

0
common/powershell/powershell.go → builder/hyperv/common/powershell/powershell.go
View File

0
common/powershell/powershell_test.go → builder/hyperv/common/powershell/powershell_test.go
View File

0
common/powershell/scriptbuilder.go → builder/hyperv/common/powershell/scriptbuilder.go
View File

2
builder/hyperv/vmcx/builder.go
View File

@ -12,9 +12,9 @@ import (
"github.com/hashicorp/hcl/v2/hcldec"
hypervcommon "github.com/hashicorp/packer/builder/hyperv/common"
powershell "github.com/hashicorp/packer/builder/hyperv/common/powershell"
"github.com/hashicorp/packer/common"
"github.com/hashicorp/packer/common/bootcommand"
powershell "github.com/hashicorp/packer/common/powershell"
"github.com/hashicorp/packer/common/shutdowncommand"
"github.com/hashicorp/packer/helper/communicator"
"github.com/hashicorp/packer/helper/config"