From 65d02e5ade08354aeec794d4131a1f8913fba2b5 Mon Sep 17 00:00:00 2001 From: Noel Georgi Date: Mon, 13 Feb 2023 20:56:59 +0530 Subject: [PATCH] fix: dbus shutdown when it's not initialized If dbus is not started and a shutdown was called talos panics, fix by checking if the mock is nil. Signed-off-by: Noel Georgi --- internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_dbus.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_dbus.go b/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_dbus.go index ad27ab4d87..9fa0051644 100644 --- a/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_dbus.go +++ b/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_dbus.go @@ -75,6 +75,10 @@ func (dbus *DBusState) Stop() error { // WaitShutdown signals the shutdown over the D-Bus and waits for the inhibit lock to be released. func (dbus *DBusState) WaitShutdown(ctx context.Context) error { + if dbus.logindMock == nil { + return nil + } + if err := dbus.logindMock.EmitShutdown(); err != nil { return err }