From 360b576411e363d0c1f3a9ff5b02c09cdf1e732c Mon Sep 17 00:00:00 2001 From: Josh Curl Date: Tue, 23 Aug 2016 11:07:13 -0700 Subject: [PATCH] Use mount command to mount /dev --- cmd/control/entrypoint.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cmd/control/entrypoint.go b/cmd/control/entrypoint.go index 7af95dfc..d0cf05b2 100644 --- a/cmd/control/entrypoint.go +++ b/cmd/control/entrypoint.go @@ -9,7 +9,6 @@ import ( "github.com/codegangsta/cli" "golang.org/x/net/context" - "github.com/docker/docker/pkg/mount" "github.com/rancher/os/cmd/cloudinitexecute" "github.com/rancher/os/config" "github.com/rancher/os/docker" @@ -22,8 +21,11 @@ const ( ) func entrypointAction(c *cli.Context) error { - if err := mount.Mount("/host/dev", "/dev", "", "rbind"); err != nil { - log.Error(err) + if _, err := os.Stat("/host/dev"); err == nil { + cmd := exec.Command("mount", "--rbind", "/host/dev", "/dev") + if err := cmd.Run(); err != nil { + log.Errorf("Failed to mount /dev: %v", err) + } } if err := util.FileCopy(caBase, ca); err != nil && !os.IsNotExist(err) {