From a981ddbc77f9f6a0c2070d052c168ab2bd055741 Mon Sep 17 00:00:00 2001 From: Gabriel Goller Date: Tue, 18 Jun 2024 16:03:33 +0200 Subject: [PATCH] client: mount: wait for child to return before exiting When using the `proxmox-backup-client mount` command, the parent sometimes exits before we can print any error message. Most notably this happens when no PBS_REPOSITORY is passed, as this is the first option checked. If the underlying file descriptor has been closed, wait for the client to complete and return the error message. Reported-by: Friedrich Weber Suggested-by: Christian Ebner Signed-off-by: Gabriel Goller Tested-by: Friedrich Weber --- proxmox-backup-client/src/mount.rs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/proxmox-backup-client/src/mount.rs b/proxmox-backup-client/src/mount.rs index 538a40e6..6c75021e 100644 --- a/proxmox-backup-client/src/mount.rs +++ b/proxmox-backup-client/src/mount.rs @@ -183,7 +183,17 @@ fn mount( Ok(ForkResult::Parent { .. }) => { drop(pw); // Blocks the parent process until we are ready to go in the child - let _res = nix::unistd::read(pr.as_raw_fd(), &mut [0]).unwrap(); + let mut buffer = [0u8]; + nix::unistd::read(pr.as_raw_fd(), &mut buffer).unwrap(); + + // Read buffer didn't change, which indicates that nothing has been read and the file + // descriptor has probably been closed. This means that there was an error in the child + // process and it did not daemonize correctly. + if buffer[0] == 0 { + // Wait for the child process to finish, so it can return a nice error. + nix::sys::wait::wait().unwrap(); + } + Ok(Value::Null) } Ok(ForkResult::Child) => { @@ -264,7 +274,7 @@ async fn mount_do(param: Value, pipe: Option) -> Result { } // Signal the parent process that we are done with the setup and it can // terminate. - nix::unistd::write(pipe.as_raw_fd(), &[0u8])?; + nix::unistd::write(pipe.as_raw_fd(), &[1u8])?; let _: OwnedFd = pipe; }