diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-18 00:02:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-18 00:02:10 +0000 |
| commit | cb25ab46c19b73013571cd96306db917d0f7d76a (patch) | |
| tree | fee9a4bffec3d2c9ab639d5b87c68be8686ccbc3 /nixos/modules/system | |
| parent | d2fdbb7e40a083965d6ff26cc558afef67875c98 (diff) | |
| parent | d64d76d2f13e4ca04c5d50fc7eb6cc1a284d39c0 (diff) | |
| download | nixlib-cb25ab46c19b73013571cd96306db917d0f7d76a.tar nixlib-cb25ab46c19b73013571cd96306db917d0f7d76a.tar.gz nixlib-cb25ab46c19b73013571cd96306db917d0f7d76a.tar.bz2 nixlib-cb25ab46c19b73013571cd96306db917d0f7d76a.tar.lz nixlib-cb25ab46c19b73013571cd96306db917d0f7d76a.tar.xz nixlib-cb25ab46c19b73013571cd96306db917d0f7d76a.tar.zst nixlib-cb25ab46c19b73013571cd96306db917d0f7d76a.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 7aaa3f85bfe0..a3551f68dbe8 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -123,7 +123,7 @@ let # ZFS properties such as `setuid=off` and `exec=off` (unless manually # duplicated in `fileSystems.*.options`, defeating "zfsutil"'s purpose). copy_bin_and_libs ${lib.getOutput "mount" pkgs.util-linux}/bin/mount - copy_bin_and_libs ${pkgs.zfs}/bin/mount.zfs + copy_bin_and_libs ${config.boot.zfs.package}/bin/mount.zfs ''} # Copy some util-linux stuff. |