Unverified Commit c77e28a0 authored by Will Fancher's avatar Will Fancher Committed by GitHub
Browse files

Merge pull request #298201 from philiptaron/fix-initrd-activation-with-gpt-auto 

nixos/systemd/initrd: make systemd mount root as `rw` when using gpt-auto to find it
parents 8ab9a91a e2e43f6c

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

+4 −1
Original line number Diff line number Diff line
@@ -392,7 +392,10 @@ in { 


    boot.kernelParams = [

      "root=${config.boot.initrd.systemd.root}"

    ] ++ lib.optional (config.boot.resumeDevice != "") "resume=${config.boot.resumeDevice}";

    ] ++ lib.optional (config.boot.resumeDevice != "") "resume=${config.boot.resumeDevice}"

      # `systemd` mounts root in initrd as read-only unless "rw" is on the kernel command line.

      # For NixOS activation to succeed, we need to have root writable in initrd.

      ++ lib.optional (config.boot.initrd.systemd.root == "gpt-auto") "rw";



    boot.initrd.systemd = {

      initrdBin = [pkgs.bash pkgs.coreutils cfg.package.kmod cfg.package];