Merge pull request #462 from ccx1024cc/upmaster

fix: fscache and virtio fail to start
dragonflyoss · Jun 2, 2022 · c19d1b5 · c19d1b5
2 parents 61f0c3f + 40a016b
commit c19d1b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/bin/nydusd/service_controller.rs b/src/bin/nydusd/service_controller.rs
@@ -241,6 +241,9 @@ pub fn create_daemon(subargs: &SubCmdArgs, bti: BuildTimeInfo) -> Result<Arc<dyn
     let daemon = Arc::new(service_controller);
     let machine = DaemonStateMachineContext::new(daemon.clone(), from_client, to_client);
     machine.kick_state_machine()?;
+    daemon
+        .on_event(DaemonStateMachineInput::Mount)
+        .map_err(|e| eother!(e))?;
     daemon
         .on_event(DaemonStateMachineInput::Start)
         .map_err(|e| eother!(e))?;

diff --git a/src/bin/nydusd/virtiofs.rs b/src/bin/nydusd/virtiofs.rs
@@ -399,6 +399,9 @@ pub fn create_virtiofs_daemon(
     if let Some(cmd) = mount_cmd {
         daemon.service.mount(cmd)?;
     }
+    daemon
+        .on_event(DaemonStateMachineInput::Mount)
+        .map_err(|e| eother!(e))?;
     daemon
         .on_event(DaemonStateMachineInput::Start)
         .map_err(|e| eother!(e))?;