fhs: move from container

This package is not container-specific.

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

cmd/hakurei/command.go

@@ -15,8 +15,8 @@ import (
 
 	"hakurei.app/check"
 	"hakurei.app/command"
-	"hakurei.app/container/fhs"
 	"hakurei.app/ext"
+	"hakurei.app/fhs"
 	"hakurei.app/hst"
 	"hakurei.app/internal/dbus"
 	"hakurei.app/internal/env"

cmd/mbf/main.go

@@ -21,10 +21,10 @@ import (
 	"hakurei.app/check"
 	"hakurei.app/command"
 	"hakurei.app/container"
-	"hakurei.app/container/fhs"
 	"hakurei.app/container/seccomp"
 	"hakurei.app/container/std"
 	"hakurei.app/ext"
+	"hakurei.app/fhs"
 	"hakurei.app/internal/pkg"
 	"hakurei.app/internal/rosa"
 	"hakurei.app/message"

cmd/sharefs/fuse.go

@@ -33,8 +33,8 @@ import (
 
 	"hakurei.app/check"
 	"hakurei.app/container"
-	"hakurei.app/container/fhs"
 	"hakurei.app/container/std"
+	"hakurei.app/fhs"
 	"hakurei.app/hst"
 	"hakurei.app/internal/helper/proc"
 	"hakurei.app/internal/info"

container/autoetc.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"hakurei.app/check"
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 )
 
 func init() { gob.Register(new(AutoEtcOp)) }

container/autoroot.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"hakurei.app/check"
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/message"
 )
 

container/container.go

@@ -17,10 +17,10 @@ import (
 	"time"
 
 	"hakurei.app/check"
-	"hakurei.app/container/fhs"
 	"hakurei.app/container/seccomp"
 	"hakurei.app/container/std"
 	"hakurei.app/ext"
+	"hakurei.app/fhs"
 	"hakurei.app/message"
 )
 

container/container_test.go

@@ -21,10 +21,10 @@ import (
 	"hakurei.app/check"
 	"hakurei.app/command"
 	"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/ldd"
 	"hakurei.app/message"

container/init.go

@@ -15,9 +15,9 @@ import (
 	. "syscall"
 	"time"
 
-	"hakurei.app/container/fhs"
 	"hakurei.app/container/seccomp"
 	"hakurei.app/ext"
+	"hakurei.app/fhs"
 	"hakurei.app/message"
 )
 

container/initdaemon.go

@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"hakurei.app/check"
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 )
 
 func init() { gob.Register(new(DaemonOp)) }

container/initdev.go

@@ -7,7 +7,7 @@ import (
 	. "syscall"
 
 	"hakurei.app/check"
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 )
 
 func init() { gob.Register(new(MountDevOp)) }

container/initoverlay.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"hakurei.app/check"
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 )
 
 const (

container/initplace.go

@@ -6,7 +6,7 @@ import (
 	"syscall"
 
 	"hakurei.app/check"
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 )
 
 const (

container/path.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"syscall"
 
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/vfs"
 )
 

container/syscall_range_proc.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"syscall"
 
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 )
 
 // doCloseOnExec implements ensureCloseOnExec by ranging over proc_pid_fd(5).

container/sysctl.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"sync"
 
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/message"
 )
 

hst/config_test.go

@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/hst"
 )
 

hst/fsbind.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 
 	"hakurei.app/check"
-	"hakurei.app/container/fhs"
 	"hakurei.app/container/std"
+	"hakurei.app/fhs"
 )
 
 func init() { gob.Register(new(FSBind)) }

hst/hst.go

@@ -8,7 +8,7 @@ import (
 	"os"
 
 	"hakurei.app/check"
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 )
 
 // An AppError is returned while starting an app according to [hst.Config].

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"
 )

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"
 )
 

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"
 )

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"
 )

internal/outcome/hsu.go

@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"sync"
 
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/hst"
 	"hakurei.app/message"
 )

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"

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"

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"

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"
 )

internal/outcome/spaccount.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"syscall"
 
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/internal/validate"
 )
 

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"

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"

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"

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"

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"

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"

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"

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"
 )

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"
 )
 

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"
 )

internal/pkg/testdata/main.go

@@ -13,7 +13,7 @@ import (
 	"strings"
 
 	"hakurei.app/check"
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/vfs"
 )
 

internal/rosa/busybox.go

@@ -8,7 +8,7 @@ import (
 	"runtime"
 	"time"
 
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/internal/pkg"
 )
 

internal/rosa/etc.go

@@ -7,7 +7,7 @@ import (
 	"sync"
 	"syscall"
 
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/internal/pkg"
 )
 

internal/rosa/gtk.go

@@ -3,7 +3,7 @@ package rosa
 import (
 	"strings"
 
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/internal/pkg"
 )
 

internal/rosa/images.go

@@ -1,7 +1,7 @@
 package rosa
 
 import (
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/internal/pkg"
 )
 

internal/rosa/rosa.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"sync"
 
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/internal/pkg"
 )
 

ldd/exec.go

@@ -11,9 +11,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/message"
 )