cm/cm-dashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 262 Wiki Activity

Fix agent self-update issue by running nixos-rebuild detached

Browse Source 
Run nixos-rebuild with nohup in background to prevent the agent
from killing itself during system rebuild. The rebuild process
now runs independently, allowing the agent to return success
immediately and avoid crashes during binary updates.

This fixes the issue where agent would crash during rebuild
and restart with the old binary due to missing daemon-reload.
This commit is contained in:
Christoffer Martinsson 2025-10-25 15:09:17 +02:00
parent d463272cf2
commit 16ea853f5b
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
agent/src/agent.rs
View File

@ -296,10 +296,11 @@ impl Agent {
// Clone or update repository // Clone or update repository
let git_result = self.ensure_git_repository(git_url, git_branch, working_dir, api_key_file).await; let git_result = self.ensure_git_repository(git_url, git_branch, working_dir, api_key_file).await;
// Execute nixos-rebuild if git operation succeeded // Execute nixos-rebuild if git operation succeeded - run detached to avoid killing current agent
let rebuild_result = if git_result.is_ok() { let rebuild_result = if git_result.is_ok() {
info!("Git repository ready, executing nixos-rebuild"); info!("Git repository ready, executing nixos-rebuild in detached mode");
tokio::process::Command::new("sudo") tokio::process::Command::new("nohup")
.arg("sudo")
.arg("/run/current-system/sw/bin/nixos-rebuild") .arg("/run/current-system/sw/bin/nixos-rebuild")
.arg("switch") .arg("switch")
.arg("--option") .arg("--option")
@ -308,8 +309,10 @@ impl Agent {
.arg("--flake") .arg("--flake")
.arg(".") .arg(".")
.current_dir(working_dir) .current_dir(working_dir)
.output() .stdin(std::process::Stdio::null())
.await .stdout(std::process::Stdio::null())
.stderr(std::process::Stdio::null())
.spawn()
} else { } else {
return git_result.and_then(|_| unreachable!()); return git_result.and_then(|_| unreachable!());
}; };
@ -323,23 +326,15 @@ impl Agent {
info!("Maintenance mode disabled"); info!("Maintenance mode disabled");
} }
// Check rebuild result // Check rebuild start result
match rebuild_result { match rebuild_result {
Ok(output) => { Ok(_child) => {
if output.status.success() { info!("NixOS rebuild started successfully in background");
info!("NixOS rebuild completed successfully"); // Don't wait for completion to avoid agent being killed during rebuild
if !output.stdout.is_empty() {
debug!("rebuild stdout: {}", String::from_utf8_lossy(&output.stdout));
}
} else {
let stderr = String::from_utf8_lossy(&output.stderr);
error!("NixOS rebuild failed: {}", stderr);
return Err(anyhow::anyhow!("nixos-rebuild failed: {}", stderr));
}
} }
Err(e) => { Err(e) => {
error!("Failed to execute nixos-rebuild: {}", e); error!("Failed to start nixos-rebuild: {}", e);
return Err(anyhow::anyhow!("Failed to execute nixos-rebuild: {}", e)); return Err(anyhow::anyhow!("Failed to start nixos-rebuild: {}", e));
} }
} }