ecoppens/colmena
1
0
Fork 0
forked from DGNum/colmena
Code Pull requests Activity

nix: Also set the system profile...

Browse source
This commit is contained in:
Zhaofeng Li 2020-12-19 16:28:34 -08:00
parent 45b6568164
commit 2ad5027cee
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/nix/host.rs
View file

@ -7,7 +7,7 @@ use tokio::io::{AsyncBufReadExt, BufReader};
use tokio::process::Command; use tokio::process::Command;
use indicatif::ProgressBar; use indicatif::ProgressBar;
use super::{StorePath, DeploymentGoal, NixResult, NixError, NixCommand}; use super::{StorePath, DeploymentGoal, NixResult, NixError, NixCommand, SYSTEM_PROFILE};
pub(crate) fn local() -> Box<dyn Host + 'static> { pub(crate) fn local() -> Box<dyn Host + 'static> {
Box::new(Local {}) Box::new(Local {})
@ -85,7 +85,14 @@ impl Host for Local {
}) })
} }
async fn activate(&mut self, profile: &StorePath, goal: DeploymentGoal) -> NixResult<()> { async fn activate(&mut self, profile: &StorePath, goal: DeploymentGoal) -> NixResult<()> {
let activation_command = format!("{}/bin/switch-to-configuration", profile.as_path().to_str().unwrap()); let profile = profile.as_path().to_str().unwrap();
Command::new("nix-env")
.args(&["--profile", SYSTEM_PROFILE])
.args(&["--set", profile])
.passthrough()
.await?;
let activation_command = format!("{}/bin/switch-to-configuration", profile);
Command::new(activation_command) Command::new(activation_command)
.arg(goal.as_str().unwrap()) .arg(goal.as_str().unwrap())
.passthrough() .passthrough()
@ -124,7 +131,12 @@ impl Host for SSH {
}) })
} }
async fn activate(&mut self, profile: &StorePath, goal: DeploymentGoal) -> NixResult<()> { async fn activate(&mut self, profile: &StorePath, goal: DeploymentGoal) -> NixResult<()> {
let activation_command = format!("{}/bin/switch-to-configuration", profile.as_path().to_str().unwrap()); let profile = profile.as_path().to_str().unwrap();
let set_profile = self.ssh(&["nix-env", "--profile", SYSTEM_PROFILE, "--set", profile]);
self.run_command(set_profile).await?;
let activation_command = format!("{}/bin/switch-to-configuration", profile);
let command = self.ssh(&[&activation_command, goal.as_str().unwrap()]); let command = self.ssh(&[&activation_command, goal.as_str().unwrap()]);
self.run_command(command).await self.run_command(command).await
} }

2
src/nix/mod.rs
View file

@ -21,6 +21,8 @@ use host::SSH;
const HIVE_EVAL: &'static [u8] = include_bytes!("eval.nix"); const HIVE_EVAL: &'static [u8] = include_bytes!("eval.nix");
pub const SYSTEM_PROFILE: &'static str = "/nix/var/nix/profiles/system";
pub type NixResult<T> = Result<T, NixError>; pub type NixResult<T> = Result<T, NixError>;
#[derive(Debug, Snafu)] #[derive(Debug, Snafu)]