internal: move shim and init into app

This structure makes more sense, as both processes are part of an app's lifecycle.

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

8 files changed, 3 insertions, 3 deletions

diff --git a/internal/app/app.go b/internal/app/app.go
index 34b59bfc..20966b78 100644
--- a/internal/app/app.go
+++ b/internal/app/app.go
@@ -5,8 +5,8 @@ import (
 	"sync"
 
 	"git.gensokyo.uk/security/fortify/fst"
+	"git.gensokyo.uk/security/fortify/internal/app/shim"
 	"git.gensokyo.uk/security/fortify/internal/linux"
-	"git.gensokyo.uk/security/fortify/internal/priv/shim"
 )
 
 type App interface {
diff --git a/internal/priv/init/early.go b/internal/app/init/early.go
index cc1c2f7e..cc1c2f7e 100644
--- a/internal/priv/init/early.go
+++ b/internal/app/init/early.go
diff --git a/internal/priv/init/main.go b/internal/app/init/main.go
index 4c69312e..4c69312e 100644
--- a/internal/priv/init/main.go
+++ b/internal/app/init/main.go
diff --git a/internal/priv/init/payload.go b/internal/app/init/payload.go
index d1dc9ec3..d1dc9ec3 100644
--- a/internal/priv/init/payload.go
+++ b/internal/app/init/payload.go
diff --git a/internal/priv/shim/main.go b/internal/app/shim/main.go
index 7baf5330..39b7d4f9 100644
--- a/internal/priv/shim/main.go
+++ b/internal/app/shim/main.go
@@ -15,8 +15,8 @@ import (
 	"git.gensokyo.uk/security/fortify/helper/proc"
 	"git.gensokyo.uk/security/fortify/helper/seccomp"
 	"git.gensokyo.uk/security/fortify/internal"
+	init0 "git.gensokyo.uk/security/fortify/internal/app/init"
 	"git.gensokyo.uk/security/fortify/internal/fmsg"
-	init0 "git.gensokyo.uk/security/fortify/internal/priv/init"
 )
 
 // everything beyond this point runs as unconstrained target user
diff --git a/internal/priv/shim/manager.go b/internal/app/shim/manager.go
index 106e4865..106e4865 100644
--- a/internal/priv/shim/manager.go
+++ b/internal/app/shim/manager.go
diff --git a/internal/priv/shim/payload.go b/internal/app/shim/payload.go
index e659e3fd..e659e3fd 100644
--- a/internal/priv/shim/payload.go
+++ b/internal/app/shim/payload.go
diff --git a/internal/app/start.go b/internal/app/start.go
index 837ab227..171e707e 100644
--- a/internal/app/start.go
+++ b/internal/app/start.go
@@ -10,8 +10,8 @@ import (
 	"time"
 
 	"git.gensokyo.uk/security/fortify/helper"
+	"git.gensokyo.uk/security/fortify/internal/app/shim"
 	"git.gensokyo.uk/security/fortify/internal/fmsg"
-	"git.gensokyo.uk/security/fortify/internal/priv/shim"
 	"git.gensokyo.uk/security/fortify/internal/state"
 	"git.gensokyo.uk/security/fortify/internal/system"
 )