fstrim #6
All checks were successful
ci/woodpecker/push/build Pipeline was successful

This commit is contained in:
JMARyA 2025-03-26 21:32:49 +01:00
parent 1ff81b1915
commit 8d046e5852
Signed by: jmarya
GPG key ID: 901B2ADDF27C2263
3 changed files with 14 additions and 4 deletions

View file

@ -1,6 +1,10 @@
use yansi::{Color, Paint}; use yansi::{Color, Paint};
use crate::{config::DriveConfig, linux::run_command, print_status}; use crate::{
config::DriveConfig,
linux::{run_command, systemd_service_enable},
print_status,
};
// TODO : Add support for using entire block device // TODO : Add support for using entire block device
@ -111,3 +115,8 @@ pub fn has_filesystem(dev: &str) -> Option<String> {
None None
} }
pub fn setup_fstrim() {
print_status("Setting up FsTrim");
systemd_service_enable("fstrim.service");
}

View file

@ -21,7 +21,7 @@ pub fn setup_mkinitcpio(conf: &DriveConfig) {
if conf.encryption.is_some() { if conf.encryption.is_some() {
let block_uuid = find_uuid_by_dev(&conf.root).unwrap(); let block_uuid = find_uuid_by_dev(&conf.root).unwrap();
std::fs::write("/mnt/etc/kernel/cmdline", std::fs::write("/mnt/etc/kernel/cmdline",
format!("rd.luks.options=timeout=30s rd.luks.name={block_uuid}=root root=/dev/mapper/root rw") format!("rd.luks.options=timeout=30s,discard rd.luks.name={block_uuid}=root root=/dev/mapper/root rw")
).unwrap(); ).unwrap();
} else { } else {
std::fs::write("/mnt/etc/kernel/cmdline", format!("root={}", conf.root)).unwrap(); std::fs::write("/mnt/etc/kernel/cmdline", format!("root={}", conf.root)).unwrap();

View file

@ -10,7 +10,7 @@ use bluetooth::setup_bluetooth;
use boot::setup_bootloader; use boot::setup_bootloader;
use desktop::setup_desktop; use desktop::setup_desktop;
use docker::setup_docker; use docker::setup_docker;
use drives::{format_drives, mount_drives}; use drives::{format_drives, mount_drives, setup_fstrim};
use firewall::setup_firewall; use firewall::setup_firewall;
use firmware::{setup_fwupd, setup_microcode}; use firmware::{setup_fwupd, setup_microcode};
use first_boot::{first_boot_values, genfstab}; use first_boot::{first_boot_values, genfstab};
@ -180,6 +180,7 @@ pub fn install(conf: InstallConfig) {
} }
setup_fwupd(); setup_fwupd();
setup_microcode(); setup_microcode();
setup_fstrim();
setup_bootloader(); setup_bootloader();
setup_mkinitcpio(&conf.drive); setup_mkinitcpio(&conf.drive);
setup_secure_boot(); setup_secure_boot();