aboutsummaryrefslogtreecommitdiffhomepage
path: root/internal
diff options
context:
space:
mode:
authorOphestra <cat@gensokyo.uk>2025-07-02 21:23:55 +0900
committerOphestra <cat@gensokyo.uk>2025-07-02 21:23:55 +0900
commita1d98823f8d17b49b432508d071b62ccd426f1ce (patch)
treecacbe2d42f9ff3fd49b455e849770840e34d076a /internal
parent255b77d91dc40736b7bbd7d96b22500076b098e5 (diff)
hakurei: move container toplevel
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal')
-rw-r--r--internal/output.go4
-rw-r--r--internal/path.go6
-rw-r--r--internal/sys/std.go4
3 files changed, 7 insertions, 7 deletions
diff --git a/internal/output.go b/internal/output.go
index 36eb8105..a15be77d 100644
--- a/internal/output.go
+++ b/internal/output.go
@@ -1,13 +1,13 @@
package internal
import (
+ "git.gensokyo.uk/security/hakurei"
"git.gensokyo.uk/security/hakurei/internal/hlog"
- "git.gensokyo.uk/security/hakurei/sandbox"
"git.gensokyo.uk/security/hakurei/system"
)
func InstallOutput(verbose bool) {
hlog.Store(verbose)
- sandbox.SetOutput(hlog.Output{})
+ hakurei.SetOutput(hlog.Output{})
system.SetOutput(hlog.Output{})
}
diff --git a/internal/path.go b/internal/path.go
index 6b7b2200..e910287a 100644
--- a/internal/path.go
+++ b/internal/path.go
@@ -8,12 +8,12 @@ import (
)
var (
- hakurei = compPoison
- hsu = compPoison
+ hmain = compPoison
+ hsu = compPoison
)
func MustHakureiPath() string {
- if name, ok := checkPath(hakurei); ok {
+ if name, ok := checkPath(hmain); ok {
return name
}
hlog.BeforeExit()
diff --git a/internal/sys/std.go b/internal/sys/std.go
index c3913a75..098eb3cf 100644
--- a/internal/sys/std.go
+++ b/internal/sys/std.go
@@ -12,10 +12,10 @@ import (
"sync"
"syscall"
+ "git.gensokyo.uk/security/hakurei"
"git.gensokyo.uk/security/hakurei/hst"
"git.gensokyo.uk/security/hakurei/internal"
"git.gensokyo.uk/security/hakurei/internal/hlog"
- "git.gensokyo.uk/security/hakurei/sandbox"
)
// Std implements System using the standard library.
@@ -36,7 +36,7 @@ func (s *Std) Getgid() int { return os.Getgid()
func (s *Std) LookupEnv(key string) (string, bool) { return os.LookupEnv(key) }
func (s *Std) TempDir() string { return os.TempDir() }
func (s *Std) LookPath(file string) (string, error) { return exec.LookPath(file) }
-func (s *Std) MustExecutable() string { return sandbox.MustExecutable() }
+func (s *Std) MustExecutable() string { return hakurei.MustExecutable() }
func (s *Std) LookupGroup(name string) (*user.Group, error) { return user.LookupGroup(name) }
func (s *Std) ReadDir(name string) ([]os.DirEntry, error) { return os.ReadDir(name) }
func (s *Std) Stat(name string) (fs.FileInfo, error) { return os.Stat(name) }