Unverified Commit 5b3a9a81 authored by Bernardo Meurer's avatar Bernardo Meurer Committed by GitHub
Browse files

Merge pull request #185089 from NickCao/bind 

nixos/stage-1-systemd: fix initrd-fstab generation for bind mounts
parents 1139611d ce39bee9

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

+2 −1
Original line number Diff line number Diff line
@@ -103,7 +103,8 @@ let 
  fstab = pkgs.writeText "initrd-fstab" (lib.concatMapStringsSep "\n"

    ({ fsType, mountPoint, device, options, autoFormat, autoResize, ... }@fs: let

        opts = options ++ optional autoFormat "x-systemd.makefs" ++ optional autoResize "x-systemd.growfs";

      in "${device} /sysroot${mountPoint} ${fsType} ${lib.concatStringsSep "," opts}") fileSystems);

        finalDevice = if (lib.elem "bind" options) then "/sysroot${device}" else device;

      in "${finalDevice} /sysroot${mountPoint} ${fsType} ${lib.concatStringsSep "," opts}") fileSystems);



  needMakefs = lib.any (fs: fs.autoFormat) fileSystems;

  needGrowfs = lib.any (fs: fs.autoResize) fileSystems;