aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--container/container_test.go2
-rw-r--r--container/errors.go2
-rw-r--r--container/errors_test.go2
-rw-r--r--container/mount.go2
-rw-r--r--container/mount_test.go2
-rw-r--r--container/path.go2
-rw-r--r--container/path_test.go2
-rw-r--r--internal/pkg/testdata/main.go2
-rw-r--r--vfs/mangle.go (renamed from container/vfs/mangle.go)0
-rw-r--r--vfs/mangle_test.go (renamed from container/vfs/mangle_test.go)2
-rw-r--r--vfs/mountinfo.go (renamed from container/vfs/mountinfo.go)0
-rw-r--r--vfs/mountinfo_test.go (renamed from container/vfs/mountinfo_test.go)2
-rw-r--r--vfs/unfold.go (renamed from container/vfs/unfold.go)0
-rw-r--r--vfs/unfold_test.go (renamed from container/vfs/unfold_test.go)2
14 files changed, 11 insertions, 11 deletions
diff --git a/container/container_test.go b/container/container_test.go
index 65a620e6..a5ca11a9 100644
--- a/container/container_test.go
+++ b/container/container_test.go
@@ -24,11 +24,11 @@ import (
"hakurei.app/container/fhs"
"hakurei.app/container/seccomp"
"hakurei.app/container/std"
- "hakurei.app/container/vfs"
"hakurei.app/ext"
"hakurei.app/hst"
"hakurei.app/ldd"
"hakurei.app/message"
+ "hakurei.app/vfs"
)
// Note: this package requires cgo, which is unavailable in the Go playground.
diff --git a/container/errors.go b/container/errors.go
index 150dcd13..7c45037a 100644
--- a/container/errors.go
+++ b/container/errors.go
@@ -6,8 +6,8 @@ import (
"syscall"
"hakurei.app/container/check"
- "hakurei.app/container/vfs"
"hakurei.app/message"
+ "hakurei.app/vfs"
)
// messageFromError returns a printable error message for a supported concrete type.
diff --git a/container/errors_test.go b/container/errors_test.go
index 71b4a9ac..a7a1bb80 100644
--- a/container/errors_test.go
+++ b/container/errors_test.go
@@ -10,7 +10,7 @@ import (
"hakurei.app/container/check"
"hakurei.app/container/stub"
- "hakurei.app/container/vfs"
+ "hakurei.app/vfs"
)
func TestMessageFromError(t *testing.T) {
diff --git a/container/mount.go b/container/mount.go
index 360a71dc..171b210b 100644
--- a/container/mount.go
+++ b/container/mount.go
@@ -6,8 +6,8 @@ import (
"os"
. "syscall"
- "hakurei.app/container/vfs"
"hakurei.app/message"
+ "hakurei.app/vfs"
)
/*
diff --git a/container/mount_test.go b/container/mount_test.go
index aca64679..ffacf18e 100644
--- a/container/mount_test.go
+++ b/container/mount_test.go
@@ -6,7 +6,7 @@ import (
"testing"
"hakurei.app/container/stub"
- "hakurei.app/container/vfs"
+ "hakurei.app/vfs"
)
func TestBindMount(t *testing.T) {
diff --git a/container/path.go b/container/path.go
index 965ad494..80c64b29 100644
--- a/container/path.go
+++ b/container/path.go
@@ -10,7 +10,7 @@ import (
"syscall"
"hakurei.app/container/fhs"
- "hakurei.app/container/vfs"
+ "hakurei.app/vfs"
)
const (
diff --git a/container/path_test.go b/container/path_test.go
index d1754559..b0ec4645 100644
--- a/container/path_test.go
+++ b/container/path_test.go
@@ -11,7 +11,7 @@ import (
"unsafe"
"hakurei.app/container/check"
- "hakurei.app/container/vfs"
+ "hakurei.app/vfs"
)
func TestToSysroot(t *testing.T) {
diff --git a/internal/pkg/testdata/main.go b/internal/pkg/testdata/main.go
index ad047a2a..f013f088 100644
--- a/internal/pkg/testdata/main.go
+++ b/internal/pkg/testdata/main.go
@@ -14,7 +14,7 @@ import (
"hakurei.app/container/check"
"hakurei.app/container/fhs"
- "hakurei.app/container/vfs"
+ "hakurei.app/vfs"
)
func main() {
diff --git a/container/vfs/mangle.go b/vfs/mangle.go
index af7a0463..af7a0463 100644
--- a/container/vfs/mangle.go
+++ b/vfs/mangle.go
diff --git a/container/vfs/mangle_test.go b/vfs/mangle_test.go
index 0227e8e1..91abdb36 100644
--- a/container/vfs/mangle_test.go
+++ b/vfs/mangle_test.go
@@ -3,7 +3,7 @@ package vfs_test
import (
"testing"
- "hakurei.app/container/vfs"
+ "hakurei.app/vfs"
)
func TestUnmangle(t *testing.T) {
diff --git a/container/vfs/mountinfo.go b/vfs/mountinfo.go
index 77f6a35d..77f6a35d 100644
--- a/container/vfs/mountinfo.go
+++ b/vfs/mountinfo.go
diff --git a/container/vfs/mountinfo_test.go b/vfs/mountinfo_test.go
index 65d062e7..2b6254c4 100644
--- a/container/vfs/mountinfo_test.go
+++ b/vfs/mountinfo_test.go
@@ -13,7 +13,7 @@ import (
"syscall"
"testing"
- "hakurei.app/container/vfs"
+ "hakurei.app/vfs"
)
func TestDecoderError(t *testing.T) {
diff --git a/container/vfs/unfold.go b/vfs/unfold.go
index 37c4cef3..37c4cef3 100644
--- a/container/vfs/unfold.go
+++ b/vfs/unfold.go
diff --git a/container/vfs/unfold_test.go b/vfs/unfold_test.go
index 3e9d2702..642cc021 100644
--- a/container/vfs/unfold_test.go
+++ b/vfs/unfold_test.go
@@ -6,7 +6,7 @@ import (
"strings"
"testing"
- "hakurei.app/container/vfs"
+ "hakurei.app/vfs"
)
func TestUnfold(t *testing.T) {