fhs: move from container

This package is not container-specific.

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

14 files changed, 12 insertions, 112 deletions

diff --git a/container/autoetc.go b/container/autoetc.go
index f487e383..3634d296 100644
--- a/container/autoetc.go
+++ b/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)) }
diff --git a/container/autoroot.go b/container/autoroot.go
index 7aecf8be..a982e879 100644
--- a/container/autoroot.go
+++ b/container/autoroot.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"hakurei.app/check"
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/message"
 )
 
diff --git a/container/container.go b/container/container.go
index 8666e760..30b77c8d 100644
--- a/container/container.go
+++ b/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"
 )
 
diff --git a/container/container_test.go b/container/container_test.go
index fcef2d5d..0d6a7976 100644
--- a/container/container_test.go
+++ b/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"
diff --git a/container/fhs/abs.go b/container/fhs/abs.go
deleted file mode 100644
index ce2ae34d..00000000
--- a/container/fhs/abs.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package fhs
-
-import (
-	_ "unsafe" // for go:linkname
-
-	"hakurei.app/check"
-)
-
-/* constants in this file bypass abs check, be extremely careful when changing them! */
-
-// unsafeAbs returns check.Absolute on any string value.
-//
-//go:linkname unsafeAbs hakurei.app/check.unsafeAbs
-func unsafeAbs(pathname string) *check.Absolute
-
-var (
-	// AbsRoot is [Root] as [check.Absolute].
-	AbsRoot = unsafeAbs(Root)
-	// AbsEtc is [Etc] as [check.Absolute].
-	AbsEtc = unsafeAbs(Etc)
-	// AbsTmp is [Tmp] as [check.Absolute].
-	AbsTmp = unsafeAbs(Tmp)
-
-	// AbsRun is [Run] as [check.Absolute].
-	AbsRun = unsafeAbs(Run)
-	// AbsRunUser is [RunUser] as [check.Absolute].
-	AbsRunUser = unsafeAbs(RunUser)
-
-	// AbsUsr is [Usr] as [check.Absolute].
-	AbsUsr = unsafeAbs(Usr)
-	// AbsUsrBin is [UsrBin] as [check.Absolute].
-	AbsUsrBin = unsafeAbs(UsrBin)
-
-	// AbsVar is [Var] as [check.Absolute].
-	AbsVar = unsafeAbs(Var)
-	// AbsVarLib is [VarLib] as [check.Absolute].
-	AbsVarLib = unsafeAbs(VarLib)
-
-	// AbsDev is [Dev] as [check.Absolute].
-	AbsDev = unsafeAbs(Dev)
-	// AbsDevShm is [DevShm] as [check.Absolute].
-	AbsDevShm = unsafeAbs(DevShm)
-	// AbsProc is [Proc] as [check.Absolute].
-	AbsProc = unsafeAbs(Proc)
-	// AbsProcSelfExe is [ProcSelfExe] as [check.Absolute].
-	AbsProcSelfExe = unsafeAbs(ProcSelfExe)
-	// AbsSys is [Sys] as [check.Absolute].
-	AbsSys = unsafeAbs(Sys)
-)
diff --git a/container/fhs/fhs.go b/container/fhs/fhs.go
deleted file mode 100644
index 6d098d0c..00000000
--- a/container/fhs/fhs.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Package fhs provides constant and checked pathname values for common FHS paths.
-package fhs
-
-const (
-	// Root points to the file system root.
-	Root = "/"
-	// Etc points to the directory for system-specific configuration.
-	Etc = "/etc/"
-	// Tmp points to the place for small temporary files.
-	Tmp = "/tmp/"
-
-	// Run points to a "tmpfs" file system for system packages to place runtime
-	// data, socket files, and similar.
-	Run = "/run/"
-	// RunUser points to a directory containing per-user runtime directories,
-	// each usually individually mounted "tmpfs" instances.
-	RunUser = Run + "user/"
-
-	// Usr points to vendor-supplied operating system resources.
-	Usr = "/usr/"
-	// UsrBin points to binaries and executables for user commands that shall
-	// appear in the $PATH search path.
-	UsrBin = Usr + "bin/"
-
-	// Var points to persistent, variable system data. Writable during normal
-	// system operation.
-	Var = "/var/"
-	// VarLib points to persistent system data.
-	VarLib = Var + "lib/"
-	// VarEmpty points to a nonstandard directory that is usually empty.
-	VarEmpty = Var + "empty/"
-
-	// Dev points to the root directory for device nodes.
-	Dev = "/dev/"
-	// DevShm is the place for POSIX shared memory segments, as created via
-	// shm_open(3).
-	DevShm = "/dev/shm/"
-	// Proc points to a virtual kernel file system exposing the process list and
-	// other functionality.
-	Proc = "/proc/"
-	// ProcSys points to a hierarchy below /proc/ that exposes a number of
-	// kernel tunables.
-	ProcSys = Proc + "sys/"
-	// ProcSelf resolves to the process's own /proc/pid directory.
-	ProcSelf = Proc + "self/"
-	// ProcSelfExe is a symbolic link to program pathname.
-	ProcSelfExe = ProcSelf + "exe"
-	// Sys points to a virtual kernel file system exposing discovered devices
-	// and other functionality.
-	Sys = "/sys/"
-)
diff --git a/container/init.go b/container/init.go
index 3e2ec809..799bb29b 100644
--- a/container/init.go
+++ b/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"
 )
 
diff --git a/container/initdaemon.go b/container/initdaemon.go
index 19f95ea1..92b68bf0 100644
--- a/container/initdaemon.go
+++ b/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)) }
diff --git a/container/initdev.go b/container/initdev.go
index 56662f9e..38cb6e18 100644
--- a/container/initdev.go
+++ b/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)) }
diff --git a/container/initoverlay.go b/container/initoverlay.go
index 061772b4..910ce425 100644
--- a/container/initoverlay.go
+++ b/container/initoverlay.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"hakurei.app/check"
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 )
 
 const (
diff --git a/container/initplace.go b/container/initplace.go
index 8c48edc4..ab477139 100644
--- a/container/initplace.go
+++ b/container/initplace.go
@@ -6,7 +6,7 @@ import (
 	"syscall"
 
 	"hakurei.app/check"
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 )
 
 const (
diff --git a/container/path.go b/container/path.go
index 80c64b29..5170fceb 100644
--- a/container/path.go
+++ b/container/path.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"syscall"
 
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/vfs"
 )
 
diff --git a/container/syscall_range_proc.go b/container/syscall_range_proc.go
index 62b369f0..53b0eae9 100644
--- a/container/syscall_range_proc.go
+++ b/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).
diff --git a/container/sysctl.go b/container/sysctl.go
index 4387c4da..e4b7af23 100644
--- a/container/sysctl.go
+++ b/container/sysctl.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"sync"
 
-	"hakurei.app/container/fhs"
+	"hakurei.app/fhs"
 	"hakurei.app/message"
 )