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

fix OoOE

Browse source
This commit is contained in:
JMARyA 2024-12-28 06:17:53 +01:00
parent 067fe4ce5a
commit db229e2f37
Signed by: jmarya
GPG key ID: 901B2ADDF27C2263
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/install/mod.rs
View file

@ -28,6 +28,7 @@ pub mod zram;
use crate::{ use crate::{
config::InstallConfig, config::InstallConfig,
pkg::{self, install_pkgs, pacstrap}, pkg::{self, install_pkgs, pacstrap},
print_status,
}; };
pub fn str_vec(v: Vec<&str>) -> Vec<String> { pub fn str_vec(v: Vec<&str>) -> Vec<String> {
@ -94,6 +95,12 @@ pub fn install(conf: InstallConfig) {
crate::config::InstallMode::Base => {} crate::config::InstallMode::Base => {}
crate::config::InstallMode::Desktop => { crate::config::InstallMode::Desktop => {
install_pkgs(&pkg::DESKTOP_PKG); install_pkgs(&pkg::DESKTOP_PKG);
print_status("Enable SDDM");
std::os::unix::fs::symlink(
"/usr/lib/systemd/system/sddm.service",
"/mnt/etc/systemd/system/display-manager.service",
)
.unwrap();
} }
crate::config::InstallMode::Server => { crate::config::InstallMode::Server => {
install_pkgs(&pkg::SERVER_PKG); install_pkgs(&pkg::SERVER_PKG);
@ -112,9 +119,12 @@ pub fn install(conf: InstallConfig) {
} }
setup_zram(); setup_zram();
setup_secure_boot();
setup_mkinitcpio(); setup_mkinitcpio();
setup_tpm_unlock(&conf.drive); setup_secure_boot();
if conf.general.encryption {
setup_tpm_unlock(&conf.drive);
}
println!("{}", "System install complete".paint(Color::Green)); println!("{}", "System install complete".paint(Color::Green));
} }