BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

systemd shutdownRamfs: Fix infinite shutdown loop

Browse source
This commit is contained in:
Will Fancher 2023-07-28 18:52:48 -04:00
parent 66ce081faf
commit 4ecd0c119a
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/system/boot/systemd/shutdown.nix
View file

@ -30,7 +30,11 @@ in {
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
systemd.shutdownRamfs.contents."/shutdown".source = "${config.systemd.package}/lib/systemd/systemd-shutdown"; systemd.shutdownRamfs.contents = {
"/shutdown".source = "${config.systemd.package}/lib/systemd/systemd-shutdown";
"/etc/initrd-release".source = config.environment.etc.os-release.source;
"/etc/os-release".source = config.environment.etc.os-release.source;
};
systemd.shutdownRamfs.storePaths = [pkgs.runtimeShell "${pkgs.coreutils}/bin"]; systemd.shutdownRamfs.storePaths = [pkgs.runtimeShell "${pkgs.coreutils}/bin"];
systemd.mounts = [{ systemd.mounts = [{

2
nixos/tests/systemd-shutdown.nix
View file

@ -22,6 +22,6 @@ in {
machine.wait_for_console_text("Unmounting '/oldroot'") machine.wait_for_console_text("Unmounting '/oldroot'")
machine.wait_for_console_text("${msg}") machine.wait_for_console_text("${msg}")
# Don't try to sync filesystems # Don't try to sync filesystems
machine.booted = False machine.wait_for_shutdown()
''; '';
}) })