mkinitcpio
All checks were successful
ci/woodpecker/push/build/1 Pipeline was successful
ci/woodpecker/push/build/2 Pipeline was successful

This commit is contained in:
JMARyA 2025-04-27 20:58:37 +02:00
parent d418f79a25
commit b2c21e62c4
Signed by: jmarya
GPG key ID: 901B2ADDF27C2263
4 changed files with 22 additions and 13 deletions

View file

@ -8,7 +8,7 @@ use crate::{
};
/// Setup initramfs
pub fn setup_mkinitcpio(conf: &DriveConfig) {
pub fn setup_mkinitcpio(conf: &DriveConfig, secure_env: bool) {
#[cfg(target_arch = "x86_64")]
{
print_status("Writing /etc/mkinitcpio.d/linux.preset");
@ -38,11 +38,21 @@ pub fn setup_mkinitcpio(conf: &DriveConfig) {
}
print_status("Writing /etc/mkinitcpio.conf");
install_file(
"/mnt/etc/mkinitcpio.conf",
include_str!("../root/mkinitcpio.conf"),
0o644,
);
let mut mkinitcpio = String::new();
if secure_env {
mkinitcpio.push_str("MODULES=(tpm_tis)\n");
} else {
mkinitcpio.push_str("MODULES=()\n");
}
mkinitcpio.push_str("BINARIES=()\n");
mkinitcpio.push_str("FILES=()\n");
mkinitcpio.push_str("HOOKS=(systemd plymouth autodetect microcode modconf kms keyboard sd-vconsole block sd-encrypt filesystems fsck)\n");
mkinitcpio.push_str("COMPRESSION=\"zstd\"\n");
install_file("/mnt/etc/mkinitcpio.conf", &mkinitcpio, 0o644);
arch_chroot(&["mkinitcpio", "--allpresets"], None, true);
}

View file

@ -212,7 +212,7 @@ pub fn install_mnt(conf: InstallConfig, bare: bool) {
setup_microcode();
setup_fstrim();
setup_bootloader();
setup_mkinitcpio(&conf.drive);
setup_mkinitcpio(&conf.drive, conf.general.secure_boot.unwrap_or(false));
if bare && has_secure_boot() {
if conf.general.secure_boot.unwrap_or(true) {

View file

@ -13,7 +13,11 @@ pub fn change_passwd(user: &str, pw: &str) {
pub fn setup_users(conf: &[UserConfig]) {
if !conf.is_empty() {
install_pkgs(&["doas"]);
install_file("/mnt/etc/doas.conf", "permit persist :wheel as root", 0o644);
install_file(
"/mnt/etc/doas.conf",
"permit persist :wheel as root\n",
0o644,
);
}
for user in conf {

View file

@ -1,5 +0,0 @@
MODULES=(tpm_tis)
BINARIES=()
FILES=()
HOOKS=(systemd plymouth autodetect microcode modconf kms keyboard sd-vconsole block sd-encrypt filesystems fsck)
COMPRESSION="zstd"