Skip to content

Commit f745399

Browse files
committed
pass defaults for shared_net_mask/address if error occurs, closes #209
1 parent bf9fa1d commit f745399

File tree

4 files changed

+8
-30
lines changed

4 files changed

+8
-30
lines changed

cmd_init.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,7 @@ var initCommand = cli.Command{
5050
cfg.Cpu = askInt("CPU cores to allocate to VM", 2)
5151
cfg.Memory = askInt("Memory to allocate to VM (in gigabytes)", 2)
5252

53-
host, err := getHostAddress()
54-
if err != nil {
55-
return cli.NewExitError(err.Error(), 1)
56-
}
57-
53+
host, _ := getHostAddress()
5854
cfg.DNS = askString("DNS server", host)
5955
cfg.Docker = askString("Docker version", "latest")
6056
cfg.Extra = ask("Extra flags to pass to the docker daemon")

net.go

+4-10
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,10 @@ import (
77
)
88

99
func getNetAddress() (string, error) {
10-
rawAddr, err := getHostAddress()
11-
if err != nil {
12-
return "", err
13-
}
10+
rawAddr, _ := getHostAddress()
1411
addr := net.ParseIP(rawAddr)
1512

16-
rawMask, err := getNetMask()
17-
if err != nil {
18-
return "", err
19-
}
13+
rawMask, _ := getNetMask()
2014
mask := net.IPMask(net.ParseIP(rawMask).To4())
2115

2216
return addr.Mask(mask).String(), nil
@@ -25,7 +19,7 @@ func getNetAddress() (string, error) {
2519
func getHostAddress() (string, error) {
2620
addr, err := exec.Command("defaults", "read", "/Library/Preferences/SystemConfiguration/com.apple.vmnet.plist", "Shared_Net_Address").Output()
2721
if err != nil {
28-
return "", err
22+
return "192.168.64.1", err
2923
}
3024

3125
return strings.TrimSpace(string(addr)), nil
@@ -34,7 +28,7 @@ func getHostAddress() (string, error) {
3428
func getNetMask() (string, error) {
3529
mask, err := exec.Command("defaults", "read", "/Library/Preferences/SystemConfiguration/com.apple.vmnet.plist", "Shared_Net_Mask").Output()
3630
if err != nil {
37-
return "", err
31+
return "255.255.255.0", err
3832
}
3933

4034
return strings.TrimSpace(string(mask)), nil

nfs.go

+2-10
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@ func ensureNFS(home string) error {
1515
return err
1616
}
1717

18-
mask, err := getNetMask()
19-
if err != nil {
20-
return err
21-
}
22-
18+
mask, _ := getNetMask()
2319
export := fmt.Sprintf("%s -network %s -mask %s -alldirs -maproot=root:wheel", home, addr, mask)
2420

2521
if _, err = os.Stat("/etc/exports"); os.IsNotExist(err) {
@@ -92,11 +88,7 @@ func removeNFS(home string) error {
9288
return err
9389
}
9490

95-
mask, err := getNetMask()
96-
if err != nil {
97-
return err
98-
}
99-
91+
mask, _ := getNetMask()
10092
export := fmt.Sprintf("%s -network %s -mask %s -alldirs -maproot=root:wheel", home, addr, mask)
10193

10294
rawExports, err := ioutil.ReadFile("/etc/exports")

tar.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,7 @@ func generateTarball(user User) ([]byte, error) {
9898
return nil, err
9999
}
100100

101-
hostIp, err := getHostAddress()
102-
if err != nil {
103-
return nil, err
104-
}
105-
101+
hostIp, _ := getHostAddress()
106102
hostIpBytes := []byte(hostIp)
107103
hostIpHeader := &tar.Header{
108104
Name: "/etc/dlite/host_ip",

0 commit comments

Comments
 (0)