From 5d25bee7869e5ecec20e9bddc9f27d9b4a0b0988 Mon Sep 17 00:00:00 2001 From: Ophestra Umiker Date: Thu, 19 Dec 2024 11:14:31 +0900 Subject: [PATCH] fortify: remove systemd check This is no longer necessary as fortify no longer integrates with external user switchers. Signed-off-by: Ophestra Umiker --- internal/linux/interface.go | 2 -- internal/linux/std.go | 32 -------------------------------- main.go | 4 ---- 3 files changed, 38 deletions(-) diff --git a/internal/linux/interface.go b/internal/linux/interface.go index a920492..ff54284 100644 --- a/internal/linux/interface.go +++ b/internal/linux/interface.go @@ -39,8 +39,6 @@ type System interface { Paths() Paths // Uid invokes fsu and returns target uid. Uid(aid int) (int, error) - // SdBooted implements https://www.freedesktop.org/software/systemd/man/sd_booted.html - SdBooted() bool } // Paths contains environment dependent paths used by fortify. diff --git a/internal/linux/std.go b/internal/linux/std.go index 4ea5b90..61864be 100644 --- a/internal/linux/std.go +++ b/internal/linux/std.go @@ -1,7 +1,6 @@ package linux import ( - "errors" "io" "io/fs" "os" @@ -19,9 +18,6 @@ type Std struct { paths Paths pathsOnce sync.Once - sdBooted bool - sdBootedOnce sync.Once - uidOnce sync.Once uidCopy map[int]struct { uid int @@ -90,31 +86,3 @@ func (s *Std) Uid(aid int) (int, error) { return u.uid, u.err } } - -func (s *Std) SdBooted() bool { - s.sdBootedOnce.Do(func() { s.sdBooted = copySdBooted() }) - return s.sdBooted -} - -const systemdCheckPath = "/run/systemd/system" - -func copySdBooted() bool { - if v, err := sdBooted(); err != nil { - fmsg.Println("cannot read systemd marker:", err) - return false - } else { - return v - } -} - -func sdBooted() (bool, error) { - _, err := os.Stat(systemdCheckPath) - if err != nil { - if errors.Is(err, fs.ErrNotExist) { - err = nil - } - return false, err - } - - return true, nil -} diff --git a/main.go b/main.go index e391435..65c5a81 100644 --- a/main.go +++ b/main.go @@ -277,10 +277,6 @@ func main() { } func runApp(config *fst.Config) { - if os.SdBooted() { - fmsg.VPrintln("system booted with systemd as init system") - } - a, err := app.New(os) if err != nil { fmsg.Fatalf("cannot create app: %s\n", err)