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

Revert "Prevalidate Hardware Specs on Linux"

Browse Source 
This reverts commit eda84cb2d38dc0edc53b705661e9f680d104273e.
This commit is contained in:
Chris Bednarski 2016-02-02 12:41:43 -08:00
parent 6504f4f777
commit 24dc798cfb
6 changed files with 2 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
builder/virtualbox/common/vboxmanage_config.go
View File

@ -1,10 +1,6 @@
package common
import (
"fmt"
"strconv"
"github.com/mitchellh/packer/common"
"github.com/mitchellh/packer/template/interpolate"
)
@ -15,25 +11,7 @@ type VBoxManageConfig struct {
func (c *VBoxManageConfig) Prepare(ctx *interpolate.Context) []error {
if c.VBoxManage == nil {
c.VBoxManage = make([][]string, 0)
return nil
}
var errs []error
var err error
var desiredMem uint64
for _, cmd := range c.VBoxManage {
if cmd[2] == "--memory" {
desiredMem, err = strconv.ParseUint(cmd[3], 10, 64)
if err != nil {
errs = append(errs, fmt.Errorf("Error parsing string: %s", err))
}
}
}
if err = common.AvailableMem(desiredMem); err != nil {
errs = append(errs, fmt.Errorf("Unavailable Resources: %s", err))
}
return errs
return nil
}

6
builder/virtualbox/iso/builder.go
View File

@ -152,12 +152,6 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
b.config.GuestAdditionsSHA256 = strings.ToLower(b.config.GuestAdditionsSHA256)
}
// Determine if DiskSize is able to be allocated
if err = common.AvailableDisk(uint64(b.config.DiskSize)); err != nil {
errs = packer.MultiErrorAppend(errs,
fmt.Errorf("Unavailable Resources: %s", err))
}
// Warnings
if b.config.ShutdownCommand == "" {
warnings = append(warnings,

23
builder/vmware/common/vmx_config.go
View File

@ -1,10 +1,6 @@
package common
import (
"fmt"
"strconv"
"github.com/mitchellh/packer/common"
"github.com/mitchellh/packer/template/interpolate"
)
@ -14,22 +10,5 @@ type VMXConfig struct {
}
func (c *VMXConfig) Prepare(ctx *interpolate.Context) []error {
var errs []error
var err error
var desiredMem uint64
for k, v := range c.VMXData {
if k == "memsize" {
desiredMem, err = strconv.ParseUint(v, 10, 64)
if err != nil {
errs = append(errs, fmt.Errorf("Error parsing string: %s", err))
}
}
}
if err = common.AvailableMem(desiredMem); err != nil {
errs = append(errs, fmt.Errorf("Unavailable Resources: %s", err))
}
return errs
return nil
}

6
builder/vmware/iso/builder.go
View File

@ -171,12 +171,6 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
}
}
// Determine if DiskSize is able to be allocated
if err = common.AvailableDisk(uint64(b.config.DiskSize)); err != nil {
errs = packer.MultiErrorAppend(errs,
fmt.Errorf("Unavailable Resources: %s", err))
}
// Warnings
if b.config.ShutdownCommand == "" {
warnings = append(warnings,

37
common/resources_linux.go
View File

@ -1,37 +0,0 @@
package common
import (
"fmt"
"os"
sigar "github.com/cloudfoundry/gosigar"
)
func AvailableMem(desired uint64) error {
free := freeMem()
if desired > free {
return fmt.Errorf("RAM - Requested - %dMB - Available %dMB", desired, free)
}
return nil
}
func freeMem() uint64 {
mem := sigar.Mem{}
mem.Get()
return (mem.Free / 1024 / 1024)
}
func AvailableDisk(desired uint64) error {
free := freeDisk()
if desired > free {
return fmt.Errorf("Disk - Requested - %dMB - Available %dMB", desired, free)
}
return nil
}
func freeDisk() uint64 {
disk := sigar.FileSystemUsage{}
workingDirectory, _ := os.Getwd()
disk.Get(workingDirectory)
return (disk.Avail / 1024)
}

11
common/resources_universal.go
View File

@ -1,11 +0,0 @@
// +build !linux
package common
func AvailableMem(desired uint64) error {
return nil
}
func AvailableDisk(desired uint64) error {
return nil
}