fhs: move from container

This package is not container-specific.

Signed-off-by: Ophestra <cat@gensokyo.uk>

26 files changed, 26 insertions, 26 deletions

diff --git a/internal/env/env_test.go b/internal/env/env_test.go
index 8758ca31..0bfcf83b 100644
--- a/internal/env/env_test.go
+++ b/internal/env/env_test.go
@@ -7,8 +7,8 @@ import (
 
 	"hakurei.app/check"
 	"hakurei.app/container"
-	"hakurei.app/container/fhs"
 	"hakurei.app/container/stub"
+	"hakurei.app/fhs"
 	"hakurei.app/hst"
 	"hakurei.app/internal/env"
 )
diff --git a/internal/helper/container_test.go b/internal/helper/container_test.go
index 300d17f4..02dc5346 100644
--- a/internal/helper/container_test.go
+++ b/internal/helper/container_test.go
@@ -8,7 +8,7 @@ import (
 
 	"hakurei.app/check"
 	"hakurei.app/container"
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/internal/helper"
 )
 
diff --git a/internal/lockedfile/internal/filelock/filelock_test.go b/internal/lockedfile/internal/filelock/filelock_test.go
index 4498423a..a545010d 100644
--- a/internal/lockedfile/internal/filelock/filelock_test.go
+++ b/internal/lockedfile/internal/filelock/filelock_test.go
@@ -14,7 +14,7 @@ import (
 	"testing"
 	"time"
 
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/internal/lockedfile/internal/filelock"
 	"hakurei.app/internal/lockedfile/internal/testexec"
 )
diff --git a/internal/lockedfile/lockedfile_test.go b/internal/lockedfile/lockedfile_test.go
index 7ad3c2c5..c86b7786 100644
--- a/internal/lockedfile/lockedfile_test.go
+++ b/internal/lockedfile/lockedfile_test.go
@@ -15,7 +15,7 @@ import (
 	"testing"
 	"time"
 
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/internal/lockedfile"
 	"hakurei.app/internal/lockedfile/internal/testexec"
 )
diff --git a/internal/outcome/hsu.go b/internal/outcome/hsu.go
index 84751b45..118fd681 100644
--- a/internal/outcome/hsu.go
+++ b/internal/outcome/hsu.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"sync"
 
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/hst"
 	"hakurei.app/message"
 )
diff --git a/internal/outcome/process.go b/internal/outcome/process.go
index 6ee26f6d..9b8fc537 100644
--- a/internal/outcome/process.go
+++ b/internal/outcome/process.go
@@ -14,7 +14,7 @@ import (
 
 	"hakurei.app/check"
 	"hakurei.app/container"
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/hst"
 	"hakurei.app/internal/info"
 	"hakurei.app/internal/store"
diff --git a/internal/outcome/run_test.go b/internal/outcome/run_test.go
index 83e6d98a..73219bbe 100644
--- a/internal/outcome/run_test.go
+++ b/internal/outcome/run_test.go
@@ -17,9 +17,9 @@ import (
 
 	"hakurei.app/check"
 	"hakurei.app/container"
-	"hakurei.app/container/fhs"
 	"hakurei.app/container/seccomp"
 	"hakurei.app/container/std"
+	"hakurei.app/fhs"
 	"hakurei.app/hst"
 	"hakurei.app/internal/acl"
 	"hakurei.app/internal/dbus"
diff --git a/internal/outcome/shim.go b/internal/outcome/shim.go
index 43be1282..6f509e14 100644
--- a/internal/outcome/shim.go
+++ b/internal/outcome/shim.go
@@ -15,10 +15,10 @@ import (
 
 	"hakurei.app/check"
 	"hakurei.app/container"
-	"hakurei.app/container/fhs"
 	"hakurei.app/container/seccomp"
 	"hakurei.app/container/std"
 	"hakurei.app/ext"
+	"hakurei.app/fhs"
 	"hakurei.app/hst"
 	"hakurei.app/internal/pipewire"
 	"hakurei.app/message"
diff --git a/internal/outcome/shim_test.go b/internal/outcome/shim_test.go
index 61d167f5..aa8220b8 100644
--- a/internal/outcome/shim_test.go
+++ b/internal/outcome/shim_test.go
@@ -10,11 +10,11 @@ import (
 	"testing"
 
 	"hakurei.app/container"
-	"hakurei.app/container/fhs"
 	"hakurei.app/container/seccomp"
 	"hakurei.app/container/std"
 	"hakurei.app/container/stub"
 	"hakurei.app/ext"
+	"hakurei.app/fhs"
 	"hakurei.app/hst"
 	"hakurei.app/internal/env"
 )
diff --git a/internal/outcome/spaccount.go b/internal/outcome/spaccount.go
index 0e9c602a..1a849cb5 100644
--- a/internal/outcome/spaccount.go
+++ b/internal/outcome/spaccount.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"syscall"
 
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/internal/validate"
 )
 
diff --git a/internal/outcome/spcontainer.go b/internal/outcome/spcontainer.go
index 307729f4..ba529955 100644
--- a/internal/outcome/spcontainer.go
+++ b/internal/outcome/spcontainer.go
@@ -12,9 +12,9 @@ import (
 
 	"hakurei.app/check"
 	"hakurei.app/container"
-	"hakurei.app/container/fhs"
 	"hakurei.app/container/seccomp"
 	"hakurei.app/container/std"
+	"hakurei.app/fhs"
 	"hakurei.app/hst"
 	"hakurei.app/internal/acl"
 	"hakurei.app/internal/dbus"
diff --git a/internal/outcome/spcontainer_test.go b/internal/outcome/spcontainer_test.go
index 6b3d2b1c..d1f26468 100644
--- a/internal/outcome/spcontainer_test.go
+++ b/internal/outcome/spcontainer_test.go
@@ -9,10 +9,10 @@ import (
 
 	"hakurei.app/check"
 	"hakurei.app/container"
-	"hakurei.app/container/fhs"
 	"hakurei.app/container/seccomp"
 	"hakurei.app/container/std"
 	"hakurei.app/container/stub"
+	"hakurei.app/fhs"
 	"hakurei.app/hst"
 	"hakurei.app/internal/acl"
 	"hakurei.app/internal/dbus"
diff --git a/internal/outcome/spdbus.go b/internal/outcome/spdbus.go
index 5939ede9..a50f9cd2 100644
--- a/internal/outcome/spdbus.go
+++ b/internal/outcome/spdbus.go
@@ -3,7 +3,7 @@ package outcome
 import (
 	"encoding/gob"
 
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/hst"
 	"hakurei.app/internal/acl"
 	"hakurei.app/internal/dbus"
diff --git a/internal/outcome/spruntime.go b/internal/outcome/spruntime.go
index 1bf26a02..15974a44 100644
--- a/internal/outcome/spruntime.go
+++ b/internal/outcome/spruntime.go
@@ -4,8 +4,8 @@ import (
 	"encoding/gob"
 
 	"hakurei.app/check"
-	"hakurei.app/container/fhs"
 	"hakurei.app/container/std"
+	"hakurei.app/fhs"
 	"hakurei.app/hst"
 	"hakurei.app/internal/acl"
 	"hakurei.app/internal/system"
diff --git a/internal/outcome/spruntime_test.go b/internal/outcome/spruntime_test.go
index 58cf90d7..bd7ad37c 100644
--- a/internal/outcome/spruntime_test.go
+++ b/internal/outcome/spruntime_test.go
@@ -4,9 +4,9 @@ import (
 	"testing"
 
 	"hakurei.app/container"
-	"hakurei.app/container/fhs"
 	"hakurei.app/container/std"
 	"hakurei.app/container/stub"
+	"hakurei.app/fhs"
 	"hakurei.app/hst"
 	"hakurei.app/internal/acl"
 	"hakurei.app/internal/system"
diff --git a/internal/outcome/sptmpdir.go b/internal/outcome/sptmpdir.go
index 44931867..daa6f0de 100644
--- a/internal/outcome/sptmpdir.go
+++ b/internal/outcome/sptmpdir.go
@@ -4,8 +4,8 @@ import (
 	"encoding/gob"
 
 	"hakurei.app/check"
-	"hakurei.app/container/fhs"
 	"hakurei.app/container/std"
+	"hakurei.app/fhs"
 	"hakurei.app/hst"
 	"hakurei.app/internal/acl"
 	"hakurei.app/internal/system"
diff --git a/internal/outcome/sptmpdir_test.go b/internal/outcome/sptmpdir_test.go
index 61290c8d..fd9dc1df 100644
--- a/internal/outcome/sptmpdir_test.go
+++ b/internal/outcome/sptmpdir_test.go
@@ -4,9 +4,9 @@ import (
 	"testing"
 
 	"hakurei.app/container"
-	"hakurei.app/container/fhs"
 	"hakurei.app/container/std"
 	"hakurei.app/container/stub"
+	"hakurei.app/fhs"
 	"hakurei.app/hst"
 	"hakurei.app/internal/acl"
 	"hakurei.app/internal/system"
diff --git a/internal/outcome/spx11.go b/internal/outcome/spx11.go
index 49e5863f..c71ff530 100644
--- a/internal/outcome/spx11.go
+++ b/internal/outcome/spx11.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"hakurei.app/check"
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/hst"
 	"hakurei.app/internal/acl"
 )
diff --git a/internal/pkg/exec.go b/internal/pkg/exec.go
index 34837c35..e0512bac 100644
--- a/internal/pkg/exec.go
+++ b/internal/pkg/exec.go
@@ -17,10 +17,10 @@ import (
 
 	"hakurei.app/check"
 	"hakurei.app/container"
-	"hakurei.app/container/fhs"
 	"hakurei.app/container/seccomp"
 	"hakurei.app/container/std"
 	"hakurei.app/ext"
+	"hakurei.app/fhs"
 	"hakurei.app/message"
 )
 
diff --git a/internal/pkg/pkg_test.go b/internal/pkg/pkg_test.go
index 22f99683..3c68dbcc 100644
--- a/internal/pkg/pkg_test.go
+++ b/internal/pkg/pkg_test.go
@@ -23,8 +23,8 @@ import (
 
 	"hakurei.app/check"
 	"hakurei.app/container"
-	"hakurei.app/container/fhs"
 	"hakurei.app/container/stub"
+	"hakurei.app/fhs"
 	"hakurei.app/internal/pkg"
 	"hakurei.app/message"
 )
diff --git a/internal/pkg/testdata/main.go b/internal/pkg/testdata/main.go
index b3b6d035..bbe26d69 100644
--- a/internal/pkg/testdata/main.go
+++ b/internal/pkg/testdata/main.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 
 	"hakurei.app/check"
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/vfs"
 )
 
diff --git a/internal/rosa/busybox.go b/internal/rosa/busybox.go
index 3f8d1aef..14247f05 100644
--- a/internal/rosa/busybox.go
+++ b/internal/rosa/busybox.go
@@ -8,7 +8,7 @@ import (
 	"runtime"
 	"time"
 
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/internal/pkg"
 )
 
diff --git a/internal/rosa/etc.go b/internal/rosa/etc.go
index a998ac03..f6ef1fa5 100644
--- a/internal/rosa/etc.go
+++ b/internal/rosa/etc.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"syscall"
 
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/internal/pkg"
 )
 
diff --git a/internal/rosa/gtk.go b/internal/rosa/gtk.go
index eb85e9b6..e88bced7 100644
--- a/internal/rosa/gtk.go
+++ b/internal/rosa/gtk.go
@@ -3,7 +3,7 @@ package rosa
 import (
 	"strings"
 
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/internal/pkg"
 )
 
diff --git a/internal/rosa/images.go b/internal/rosa/images.go
index bfffaf48..30efbe8a 100644
--- a/internal/rosa/images.go
+++ b/internal/rosa/images.go
@@ -1,7 +1,7 @@
 package rosa
 
 import (
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/internal/pkg"
 )
 
diff --git a/internal/rosa/rosa.go b/internal/rosa/rosa.go
index 21623808..a28fd836 100644
--- a/internal/rosa/rosa.go
+++ b/internal/rosa/rosa.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"sync"
 
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/internal/pkg"
 )