Skip to content

Commit 9347af9

Browse files
authored
Merge pull request #9 from threefoldtech/fix-docker-pull
fix failure to pull some docker images
2 parents 43bfe1e + 8ceb496 commit 9347af9

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

pkg/vm/ch.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func (m *Machine) startCloudConsole(ctx context.Context, namespace string, machi
7272
if err := m.release(cmd.Process); err != nil {
7373
return "", err
7474
}
75-
consoleURL := fmt.Sprintf("%s:%d", mycIp, port)
75+
consoleURL := fmt.Sprintf("[%s]:%d", mycIp, port)
7676
return consoleURL, nil
7777
}
7878

@@ -301,6 +301,7 @@ func (m *Machine) waitAndAdjOom(ctx context.Context, name string, socket string)
301301
func (m *Machine) startFs(socket, path string) (int, error) {
302302
cmd := exec.Command("busybox", "setsid",
303303
"virtiofsd-rs",
304+
"--xattr",
304305
"--socket-path", socket,
305306
"--shared-dir", path,
306307
"--shared-dir-stats", fmt.Sprintf("/usr/share/btrfs/volstat.sh %s", path),

pkg/vm/machine.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,6 @@ func (i Interface) asTap() string {
7777
return buf.String()
7878
}
7979

80-
// asMACvTap returns the command line argument for this interface as a macvtap
81-
func (i Interface) asMACvTap(fd int) string {
82-
var buf bytes.Buffer
83-
buf.WriteString(fmt.Sprintf("fd=%d", fd))
84-
if len(i.Mac) > 0 {
85-
buf.WriteString(fmt.Sprintf(",mac=%s", i.Mac))
86-
}
87-
88-
return buf.String()
89-
}
90-
9180
// getType detects the interface type
9281
func (i *Interface) getType() (InterfaceType, int, error) {
9382
link, err := netlink.LinkByName(i.Tap)

0 commit comments

Comments
 (0)