alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-23 00:00:02 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #220 from ElvishJerricco/fix-nix-and-docs

Browse Source 
Fix nix and docs
This commit is contained in:
koverstreet 2024-01-23 02:53:21 -05:00 committed by GitHub
commit 39e109e5f9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.nix
View File

@ -33,7 +33,7 @@ in stdenv.mkDerivation {
udev udev
] ++ lib.optional fuseSupport fuse3; ] ++ lib.optional fuseSupport fuse3;
BCACHEFS_FUSE = if fuseSupport then "1" else ""; ${if fuseSupport then "BCACHEFS_FUSE" else null} = "1";
cargoRoot = "."; cargoRoot = ".";
# when git-based crates are updated, run: # when git-based crates are updated, run:
@ -49,7 +49,7 @@ in stdenv.mkDerivation {
makeFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" "VERSION=${commit}" ]; makeFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" "VERSION=${commit}" ];
dontStrip = true; dontStrip = true;
checkPhase = "./bcachefs version"; checkPhase = "./target/release/bcachefs version";
doCheck = true; doCheck = true;
meta = { meta = {

2
src/commands/cmd_mount.rs
View File

@ -137,7 +137,7 @@ pub struct Cli {
#[arg(short, long, default_value = "ask", verbatim_doc_comment)] #[arg(short, long, default_value = "ask", verbatim_doc_comment)]
key_location: KeyLocation, key_location: KeyLocation,
/// Device, or UUID=<UUID> /// Device, or UUID=\<UUID\>
dev: String, dev: String,
/// Where the filesystem should be mounted. If not set, then the filesystem /// Where the filesystem should be mounted. If not set, then the filesystem