colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

patch broken NFS mounting

Browse Source
This commit is contained in:
Colin 2023-09-22 09:33:05 +00:00
parent c7c669b8d4
commit 8d0678457e
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hosts/common/hardware/default.nix
View File

@ -16,6 +16,17 @@
# "systemd.log_level=debug"
# "systemd.log_target=console"
# TODO: remove once it no longer applies
# this fixes /mnt/servo-nfs mount failures
# <https://github.com/NixOS/nixpkgs/issues/255803>
boot.kernelPatches = [{
name = "nfs4-patch";
patch = pkgs.fetchpatch {
url = "https://patchwork.kernel.org/project/selinux/patch/20230911142358.883728-1-omosnace@redhat.com/raw/";
hash = "sha256-m947t39xr4VqJBZ2mYTFq9Up/NWlwueH8aXFZRQwA7c=";
};
}];
# hack in the `boot.shell_on_fail` arg since that doesn't always seem to work.
boot.initrd.preFailCommands = "allowShell=1";

7
nixpatches/list.nix
View File

@ -19,6 +19,13 @@ let
// (if title != null then { name = title; } else {})
);
in [
# (fetchpatch' {
# # fixes /mnt/servo-nfs mount failures
# # 2023/09/21: doesn't apply
# title = "linux_6_1,linux_6_5: backport patch from 6.6 for NFS fix";
# prUrl = "https://github.com/NixOS/nixpkgs/pull/256526";
# hash = "sha256-vOQ4lgnccHxEs7bTrgkzGqh49h/Gr6BQr+H4rxa5zfQ=";
# })
# (fetchpatch' {
# # disabled, at least until the PR is updated to use `pkg-config` instead of `pkgconfig`.