From 88c2a0af965551771fc8cb329fd31ab47fbbb9f8 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Fri, 16 May 2025 18:22:31 -0700
Subject: [PATCH] daemon/user: Fix ObjectManager location and initialization

---
 src/daemon/user.rs  | 5 ++++-
 src/manager/user.rs | 4 ----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/daemon/user.rs b/src/daemon/user.rs
index 2163c2a..d423a81 100644
--- a/src/daemon/user.rs
+++ b/src/daemon/user.rs
@@ -17,6 +17,7 @@ use tracing_subscriber::{fmt, Registry};
 #[cfg(not(test))]
 use xdg::BaseDirectories;
 use zbus::connection::{Builder, Connection};
+use zbus::fdo::ObjectManager;
 
 use crate::daemon::{channel, Daemon, DaemonCommand, DaemonContext};
 use crate::job::{JobManager, JobManagerService};
@@ -144,11 +145,13 @@ pub async fn daemon() -> Result<()> {
         }
     };
 
-    let context = UserContext { session };
+    let context = UserContext { session: session.clone() };
     let mut daemon = Daemon::new(subscriber, system, rx).await?;
 
     daemon.add_service(mirror_service);
     daemon.add_service(tdp_service);
 
+    session.object_server().at("/", ObjectManager {}).await?;
+
     daemon.run(context).await
 }
diff --git a/src/manager/user.rs b/src/manager/user.rs
index fa72a57..9a49766 100644
--- a/src/manager/user.rs
+++ b/src/manager/user.rs
@@ -981,10 +981,6 @@ pub(crate) async fn create_interfaces(
             .await?;
     }
 
-    object_server
-        .at(MANAGER_PATH, fdo::ObjectManager {})
-        .await?;
-
     Ok(())
 }