sokai/mynixos-config
1
1
Fork 0
forked from mirrors_public/oddlama_nix-config
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: only set boot.initrd.systemd.enable = true for non containers

Browse source
This commit is contained in:
oddlama 2023-12-18 02:19:38 +01:00
parent f2db8d3d22
commit 054103a004
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
2 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
modules/config/boot.nix
View file

@ -4,20 +4,22 @@
pkgs,
...
}: {
boot = {
initrd.systemd = {
enable = true;
emergencyAccess = config.repo.secrets.global.root.hashedPassword;
# TODO good idea? targets.emergency.wants = ["network.target" "sshd.service"];
extraBin.ip = "${pkgs.iproute2}/bin/ip";
config = lib.mkIf (!config.boot.isContainer) {
boot = {
initrd.systemd = {
enable = true;
emergencyAccess = config.repo.secrets.global.root.hashedPassword;
# TODO good idea? targets.emergency.wants = ["network.target" "sshd.service"];
extraBin.ip = "${pkgs.iproute2}/bin/ip";
};
# NOTE: Add "rd.systemd.unit=rescue.target" to debug initrd
kernelParams = ["log_buf_len=10M"];
tmp.useTmpfs = true;
loader.timeout = lib.mkDefault 2;
};
# NOTE: Add "rd.systemd.unit=rescue.target" to debug initrd
kernelParams = ["log_buf_len=10M"];
tmp.useTmpfs = true;
loader.timeout = lib.mkDefault 2;
console.earlySetup = true;
};
console.earlySetup = true;
}

2
modules/guests/container.nix
View file

@ -15,7 +15,7 @@ guestName: guestCfg: {
substring
;
initialLinkName = "mv-${(substring 0 13 (builtins.hashString "sha256" guestName))}";
initialLinkName = "mv-${(substring 0 12 (builtins.hashString "sha256" guestName))}";
in {
autoStart = guestCfg.autostart;
macvlans = ["${guestCfg.container.macvlan}:${initialLinkName}"];