Unverified Commit a2a70961 authored by Florian Klink's avatar Florian Klink Committed by GitHub
Browse files

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

systemd shutdownRamfs: Fix infinite shutdown loop
parents 0546c708 4ecd0c11

nixos/modules/system/boot/systemd/shutdown.nix

+5 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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()

  '';

})