gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #246082 from ElvishJerricco/exitrd-fix-shutdown-loop

Browse Source 
systemd shutdownRamfs: Fix infinite shutdown loop
This commit is contained in:
Florian Klink
2023-07-30 00:11:55 +02:00
committed by GitHub
parent 0546c70849 4ecd0c119a
commit a2a7096157
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/system/boot/systemd/shutdown.nix
+5 -1
View File
@@ -30,7 +30,11 @@ in {
};
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.mounts = [{
nixos/tests/systemd-shutdown.nix
+1 -1
View File
@@ -22,6 +22,6 @@ in {
machine.wait_for_console_text("Unmounting '/oldroot'")
machine.wait_for_console_text("${msg}")
# Don't try to sync filesystems
machine.booted = False
machine.wait_for_shutdown()
'';
})