From 722989c68256469963aee963bed9c6ab4bf55b67 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Tue, 17 Mar 2026 15:56:36 +0900 Subject: fhs: move from container This package is not container-specific. Signed-off-by: Ophestra --- cmd/hakurei/command.go | 2 +- cmd/mbf/main.go | 2 +- cmd/sharefs/fuse.go | 2 +- container/autoetc.go | 2 +- container/autoroot.go | 2 +- container/container.go | 2 +- container/container_test.go | 2 +- container/fhs/abs.go | 49 --------------------- container/fhs/fhs.go | 51 ---------------------- container/init.go | 2 +- container/initdaemon.go | 2 +- container/initdev.go | 2 +- container/initoverlay.go | 2 +- container/initplace.go | 2 +- container/path.go | 2 +- container/syscall_range_proc.go | 2 +- container/sysctl.go | 2 +- fhs/abs.go | 49 +++++++++++++++++++++ fhs/fhs.go | 51 ++++++++++++++++++++++ hst/config_test.go | 2 +- hst/fsbind.go | 2 +- hst/hst.go | 2 +- internal/env/env_test.go | 2 +- internal/helper/container_test.go | 2 +- .../lockedfile/internal/filelock/filelock_test.go | 2 +- internal/lockedfile/lockedfile_test.go | 2 +- internal/outcome/hsu.go | 2 +- internal/outcome/process.go | 2 +- internal/outcome/run_test.go | 2 +- internal/outcome/shim.go | 2 +- internal/outcome/shim_test.go | 2 +- internal/outcome/spaccount.go | 2 +- internal/outcome/spcontainer.go | 2 +- internal/outcome/spcontainer_test.go | 2 +- internal/outcome/spdbus.go | 2 +- internal/outcome/spruntime.go | 2 +- internal/outcome/spruntime_test.go | 2 +- internal/outcome/sptmpdir.go | 2 +- internal/outcome/sptmpdir_test.go | 2 +- internal/outcome/spx11.go | 2 +- internal/pkg/exec.go | 2 +- internal/pkg/pkg_test.go | 2 +- internal/pkg/testdata/main.go | 2 +- internal/rosa/busybox.go | 2 +- internal/rosa/etc.go | 2 +- internal/rosa/gtk.go | 2 +- internal/rosa/images.go | 2 +- internal/rosa/rosa.go | 2 +- ldd/exec.go | 2 +- 49 files changed, 145 insertions(+), 145 deletions(-) delete mode 100644 container/fhs/abs.go delete mode 100644 container/fhs/fhs.go create mode 100644 fhs/abs.go create mode 100644 fhs/fhs.go diff --git a/cmd/hakurei/command.go b/cmd/hakurei/command.go index 7b8e35b8..8f588654 100644 --- a/cmd/hakurei/command.go +++ b/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" diff --git a/cmd/mbf/main.go b/cmd/mbf/main.go index 484423da..ce2f77b5 100644 --- a/cmd/mbf/main.go +++ b/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" diff --git a/cmd/sharefs/fuse.go b/cmd/sharefs/fuse.go index f636d423..e1e16d1a 100644 --- a/cmd/sharefs/fuse.go +++ b/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" 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" ) diff --git a/fhs/abs.go b/fhs/abs.go new file mode 100644 index 00000000..ce2ae34d --- /dev/null +++ b/fhs/abs.go @@ -0,0 +1,49 @@ +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/fhs/fhs.go b/fhs/fhs.go new file mode 100644 index 00000000..6d098d0c --- /dev/null +++ b/fhs/fhs.go @@ -0,0 +1,51 @@ +// 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/hst/config_test.go b/hst/config_test.go index ac50f127..b9e44d8b 100644 --- a/hst/config_test.go +++ b/hst/config_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "hakurei.app/container/fhs" + "hakurei.app/fhs" "hakurei.app/hst" ) diff --git a/hst/fsbind.go b/hst/fsbind.go index ac628b99..355e4b15 100644 --- a/hst/fsbind.go +++ b/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)) } diff --git a/hst/hst.go b/hst/hst.go index eb4ef26d..d2dd7611 100644 --- a/hst/hst.go +++ b/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]. 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" ) diff --git a/ldd/exec.go b/ldd/exec.go index 45d33ec0..e59dfcaa 100644 --- a/ldd/exec.go +++ b/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" ) -- cgit v1.3.1