summaryrefslogtreecommitdiffhomepage
path: root/runsc/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'runsc/cmd')
-rw-r--r--runsc/cmd/boot.go8
-rw-r--r--runsc/cmd/gofer.go6
-rw-r--r--runsc/cmd/path.go10
3 files changed, 1 insertions, 23 deletions
diff --git a/runsc/cmd/boot.go b/runsc/cmd/boot.go
index 4e08dafc8..666be902a 100644
--- a/runsc/cmd/boot.go
+++ b/runsc/cmd/boot.go
@@ -93,14 +93,6 @@ func (b *Boot) Execute(_ context.Context, f *flag.FlagSet, args ...interface{})
}
specutils.LogSpec(spec)
- // Turn any relative paths in the spec to absolute by prepending the bundleDir.
- spec.Root.Path = absPath(b.bundleDir, spec.Root.Path)
- for _, m := range spec.Mounts {
- if m.Source != "" {
- m.Source = absPath(b.bundleDir, m.Source)
- }
- }
-
conf := args[0].(*boot.Config)
waitStatus := args[1].(*syscall.WaitStatus)
diff --git a/runsc/cmd/gofer.go b/runsc/cmd/gofer.go
index f28e02798..95926f5f9 100644
--- a/runsc/cmd/gofer.go
+++ b/runsc/cmd/gofer.go
@@ -16,7 +16,6 @@ package cmd
import (
"os"
- "path"
"sync"
"syscall"
@@ -108,7 +107,7 @@ func (g *Gofer) Execute(_ context.Context, f *flag.FlagSet, args ...interface{})
syscall.Umask(0)
// Find what path is going to be served by this gofer.
- root := absPath(g.bundleDir, spec.Root.Path)
+ root := spec.Root.Path
if err := syscall.Chroot(root); err != nil {
Fatalf("failed to chroot to %q: %v", root, err)
}
@@ -131,9 +130,6 @@ func (g *Gofer) Execute(_ context.Context, f *flag.FlagSet, args ...interface{})
mountIdx := 1 // first one is the root
for _, m := range spec.Mounts {
if specutils.Is9PMount(m) {
- if !path.IsAbs(m.Destination) {
- Fatalf("destination must be absolute path: %v", m.Destination)
- }
cfg := fsgofer.Config{
ROMount: isReadonlyMount(m.Options),
PanicOnWrite: g.panicOnWrite,
diff --git a/runsc/cmd/path.go b/runsc/cmd/path.go
index 4bb1dbb4f..c207b80da 100644
--- a/runsc/cmd/path.go
+++ b/runsc/cmd/path.go
@@ -16,18 +16,8 @@ package cmd
import (
"os"
- "path/filepath"
)
-// absPath turns the given path into an absolute path (if it is not already
-// absolute) by prepending the base path.
-func absPath(base, rel string) string {
- if filepath.IsAbs(rel) {
- return rel
- }
- return filepath.Join(base, rel)
-}
-
// getwdOrDie returns the current working directory and dies if it cannot.
func getwdOrDie() string {
wd, err := os.Getwd()