From 65bd7d18dbf35216d0a70c102a732c6356caee85 Mon Sep 17 00:00:00 2001 From: Ophestra Umiker Date: Fri, 18 Oct 2024 01:21:58 +0900 Subject: app/share: fix order to ensure SharePath before any of its subdirectories shareTmpdirChild happened to request an ephemeral dir within SharePath and was called before shareRuntime which ensures that path. This commit moves SharePath initialisation to shareSystem and moves shareTmpdirChild into ShareSystem. Further cleanup and tests are desperately needed for the app package but for now this fix will have to do. Signed-off-by: Ophestra Umiker --- internal/app/system.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'internal/app/system.go') diff --git a/internal/app/system.go b/internal/app/system.go index 4aeaec2d..240b38b8 100644 --- a/internal/app/system.go +++ b/internal/app/system.go @@ -8,7 +8,6 @@ import ( "git.ophivana.moe/cat/fortify/internal" "git.ophivana.moe/cat/fortify/internal/state" "git.ophivana.moe/cat/fortify/internal/system" - "git.ophivana.moe/cat/fortify/internal/verbose" ) // appSeal seals the application with child-related information @@ -76,10 +75,9 @@ func (seal *appSeal) shareAll(bus [2]*dbus.Config) error { } seal.shared = true - targetTmpdir := seal.shareTmpdirChild() - verbose.Printf("child tmpdir %q configured\n", targetTmpdir) - seal.shareRuntime() seal.shareSystem() + seal.shareRuntime() + seal.sharePasswd() if err := seal.shareDisplay(); err != nil { return err } -- cgit v1.3.1