diff options
| author | Ophestra Umiker <cat@ophivana.moe> | 2024-10-27 12:08:17 +0900 |
|---|---|---|
| committer | Ophestra Umiker <cat@ophivana.moe> | 2024-10-27 12:09:34 +0900 |
| commit | 7df9d8d01dadcb05396d278aba11afc2ab4a2328 (patch) | |
| tree | 9114e61306153b50b2def1ab6f817af49e266427 /internal/app | |
| parent | 6d8bcb63f28fb289aef8d4b702d7d938ac0af4eb (diff) | |
system: move sd_booted implementation to os abstraction
This implements lazy loading of the systemd marker (they are not accessed in init and shim) and ensures consistent behaviour when running with a stub.
Signed-off-by: Ophestra Umiker <cat@ophivana.moe>
Diffstat (limited to 'internal/app')
| -rw-r--r-- | internal/app/app_nixos_test.go | 4 | ||||
| -rw-r--r-- | internal/app/seal.go | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/internal/app/app_nixos_test.go b/internal/app/app_nixos_test.go index 9488c6b0..e2ed585f 100644 --- a/internal/app/app_nixos_test.go +++ b/internal/app/app_nixos_test.go @@ -311,3 +311,7 @@ func (s *stubNixOS) Paths() internal.Paths { RunDirPath: "/run/user/1971/fortify", } } + +func (s *stubNixOS) SdBooted() bool { + return true +} diff --git a/internal/app/seal.go b/internal/app/seal.go index b433b82e..80c3ec29 100644 --- a/internal/app/seal.go +++ b/internal/app/seal.go @@ -108,7 +108,7 @@ func (a *app) Seal(config *Config) error { } case method[LaunchMethodMachineCtl]: seal.launchOption = LaunchMethodMachineCtl - if !internal.SdBootedV { + if !a.os.SdBooted() { return fmsg.WrapError(ErrSystemd, "system has not been booted with systemd as init system") } |