From a56101c71cbc8eaf0835ebbff13d5aa9355f51d6 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Wed, 12 Jun 2024 18:01:49 -0700
Subject: [PATCH] daemon/root: Fix state loading

---
 src/daemon/mod.rs  |  3 ++-
 src/daemon/root.rs | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/daemon/mod.rs b/src/daemon/mod.rs
index f53464f..862c902 100644
--- a/src/daemon/mod.rs
+++ b/src/daemon/mod.rs
@@ -13,7 +13,7 @@ use tokio::signal::unix::{signal, SignalKind};
 use tokio::sync::mpsc::{self, Receiver, Sender};
 use tokio::task::JoinSet;
 use tokio_util::sync::CancellationToken;
-use tracing::{error, info};
+use tracing::{debug, error, info};
 use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::registry::LookupSpan;
 use zbus::connection::Connection;
@@ -109,6 +109,7 @@ impl<C: DaemonContext> Daemon<C> {
 
         let state = read_state(&context).await?;
         let config = read_config(&context).await?;
+        debug!("Starting daemon with state: {state:#?}, config: {config:#?}");
         context.start(state, config, self).await?;
 
         let mut res = loop {
diff --git a/src/daemon/root.rs b/src/daemon/root.rs
index c7cebb0..cb33bc4 100644
--- a/src/daemon/root.rs
+++ b/src/daemon/root.rs
@@ -109,16 +109,18 @@ impl DaemonContext for RootContext {
     }
 
     fn state(&self) -> RootState {
-        RootState::default()
+        self.state
     }
 
     async fn start(
         &mut self,
-        _state: RootState,
+        state: RootState,
         _config: RootConfig,
-        _daemon: &mut Daemon<RootContext>,
+        daemon: &mut Daemon<RootContext>,
     ) -> Result<()> {
-        // Nothing to do yet
+        self.state = state;
+        self.reload_ds_inhibit(daemon).await?;
+
         Ok(())
     }