navos/navinstall
navos/navinstall
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity

fix
All checks were successful
ci/woodpecker/push/build Pipeline was successful
Details

Browse source
This commit is contained in:
JMARyA 2025-01-05 08:48:33 +01:00
parent 633a0ef410
commit 78794c567e
Signed by: jmarya
GPG key ID: 901B2ADDF27C2263
2 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/install/security.rs
View file

@ -16,21 +16,44 @@ pub fn setup_tpm_unlock(conf: &DriveConfig) {
// Recovery Key
let recovery_key = arch_chroot(
&["systemd-cryptenroll", "--recovery-key", &conf.root],
Some(&format!("{}\n", conf.encryption.as_ref().unwrap())),
&vec![
"systemd-run",
"--pipe",
"--collect",
"-p",
format!(
"SetCredential=cryptenroll.passphrase:{}",
conf.encryption.as_ref().unwrap()
)
.as_str(),
"systemd-cryptenroll",
"--recovery-key",
&conf.root,
],
None,
false,
)
.0;
install_file("/mnt/root/recovery.key", &recovery_key, 0o400);
arch_chroot(
&[
&vec![
"systemd-run",
"--pipe",
"--collect",
"-p",
format!(
"SetCredential=cryptenroll.passphrase:{}",
conf.encryption.as_ref().unwrap()
)
.as_str(),
"systemd-cryptenroll",
"--tpm2-device=auto",
&conf.root,
"--tpm2-pcrs=7",
],
Some(&format!("{}\n", conf.encryption.as_ref().unwrap())),
None,
false,
);
}

2
src/pkg.rs
View file

@ -3,7 +3,7 @@ use crate::{
linux::{arch_chroot, run_command},
};
pub const DESKTOP_PKG: [&str; 3] = ["plasma", "sddm", "navos/navos"];
pub const DESKTOP_PKG: [&str; 5] = ["plasma", "sddm", "konsole", "dolphin", "navos/navos"];
pub const SERVER_PKG: [&str; 2] = ["tmux", "navos/navos"];