s0me1newithhand7s/system-manager
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Store the profile in a subdirectory of /nix/var/nix/profiles

Browse source 
Otherwise the grub installation script treats them as system profiles and tries to include them in the bootloader menu (See 5eb6139626/nixos/modules/system/boot/loader/grub/install-grub.pl (L570)).
This commit is contained in:
R-VdP 2023-02-15 11:13:43 +01:00
parent e2e0e74a74
commit 972d27b977
No known key found for this signature in database
2 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/generate.rs
View file

@ -1,10 +1,11 @@
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::HashMap; use std::collections::HashMap;
use std::fs::DirBuilder;
use std::path::Path; use std::path::Path;
use std::{fs, process, str}; use std::{fs, process, str};
use super::{create_store_link, StorePath, FLAKE_ATTR, GCROOT_PATH, PROFILE_PATH}; use super::{create_store_link, StorePath, FLAKE_ATTR, GCROOT_PATH, PROFILE_DIR, PROFILE_NAME};
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
@ -21,27 +22,34 @@ pub fn generate(flake_uri: &str) -> Result<()> {
log::info!("Running nix build..."); log::info!("Running nix build...");
let store_path = run_nix_build(flake_uri, &flake_attr).and_then(get_store_path)?; let store_path = run_nix_build(flake_uri, &flake_attr).and_then(get_store_path)?;
let profile_dir = Path::new(PROFILE_DIR);
let profile_name = Path::new(PROFILE_NAME);
log::info!("Creating new generation from {}", store_path); log::info!("Creating new generation from {}", store_path);
install_nix_profile(&store_path, PROFILE_PATH).map(print_out_and_err)?; install_nix_profile(&store_path, profile_dir, profile_name).map(print_out_and_err)?;
log::info!("Registering GC root..."); log::info!("Registering GC root...");
create_gcroot(GCROOT_PATH, PROFILE_PATH)?; create_gcroot(GCROOT_PATH, &profile_dir.join(profile_name))?;
log::info!("Done"); log::info!("Done");
Ok(()) Ok(())
} }
fn install_nix_profile(store_path: &StorePath, profile_path: &str) -> Result<process::Output> { fn install_nix_profile(
store_path: &StorePath,
profile_dir: &Path,
profile_name: &Path,
) -> Result<process::Output> {
DirBuilder::new().recursive(true).create(profile_dir)?;
process::Command::new("nix-env") process::Command::new("nix-env")
.arg("--profile") .arg("--profile")
.arg(profile_path) .arg(profile_dir.join(profile_name))
.arg("--set") .arg("--set")
.arg(&store_path.store_path) .arg(&store_path.store_path)
.output() .output()
.map_err(anyhow::Error::from) .map_err(anyhow::Error::from)
} }
fn create_gcroot(gcroot_path: &str, profile_path: &str) -> Result<()> { fn create_gcroot(gcroot_path: &str, profile_path: &Path) -> Result<()> {
let profile_store_path = fs::canonicalize(profile_path)?; let profile_store_path = fs::canonicalize(profile_path)?;
let store_path = StorePath::from(String::from(profile_store_path.to_string_lossy())); let store_path = StorePath::from(String::from(profile_store_path.to_string_lossy()));
create_store_link(&store_path, Path::new(gcroot_path)) create_store_link(&store_path, Path::new(gcroot_path))

3
src/lib.rs
View file

@ -9,7 +9,8 @@ use std::path::{Path, PathBuf};
use std::{fs, str}; use std::{fs, str};
const FLAKE_ATTR: &str = "systemConfig"; const FLAKE_ATTR: &str = "systemConfig";
const PROFILE_PATH: &str = "/nix/var/nix/profiles/system-manager"; const PROFILE_DIR: &str = "/nix/var/nix/profiles/system-manager-profiles";
const PROFILE_NAME: &str = "system-manager";
const GCROOT_PATH: &str = "/nix/var/nix/gcroots/system-manager-current"; const GCROOT_PATH: &str = "/nix/var/nix/gcroots/system-manager-current";
const SYSTEM_MANAGER_STATE_DIR: &str = "/var/lib/system-manager/state"; const SYSTEM_MANAGER_STATE_DIR: &str = "/var/lib/system-manager/state";
const SERVICES_STATE_FILE_NAME: &str = "services.json"; const SERVICES_STATE_FILE_NAME: &str = "services.json";