Merge pull request #310504 from reedriley/bcachefs-tools-fix
bcachefs-tools: patch to fix unlocking encrypted fs at boot with bcachefs-tools-1.7.0
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
pkg-config,
|
||||
libuuid,
|
||||
libsodium,
|
||||
@@ -72,6 +73,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# FIXME: Try enabling this once the default linux kernel is at least 6.7
|
||||
doCheck = false; # needs bcachefs module loaded on builder
|
||||
|
||||
patches = [
|
||||
# code refactoring of bcachefs-tools broke reading passphrases from stdin (vs. terminal)
|
||||
# upstream issue https://github.com/koverstreet/bcachefs-tools/issues/261
|
||||
(fetchpatch {
|
||||
url = "https://github.com/koverstreet/bcachefs-tools/commit/38b0cb721d2a35f5a4af429bc7bd367461f2fa26.patch";
|
||||
hash = "sha256-/9reye+Qoa+EMkS+wfdX+KwDeLHHJ/S+Qm7sWl0MtqM=";
|
||||
})
|
||||
];
|
||||
|
||||
preCheck = lib.optionalString (!fuseSupport) ''
|
||||
rm tests/test_fuse.py
|
||||
'';
|
||||
|
||||
Reference in New Issue
Block a user