summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.nix4
-rw-r--r--src/commands/cmd_mount.rs2
2 files changed, 3 insertions, 3 deletions
diff --git a/build.nix b/build.nix
index a37a6c6e..a7383d1b 100644
--- a/build.nix
+++ b/build.nix
@@ -33,7 +33,7 @@ in stdenv.mkDerivation {
udev
] ++ lib.optional fuseSupport fuse3;
- BCACHEFS_FUSE = if fuseSupport then "1" else "";
+ ${if fuseSupport then "BCACHEFS_FUSE" else null} = "1";
cargoRoot = ".";
# when git-based crates are updated, run:
@@ -49,7 +49,7 @@ in stdenv.mkDerivation {
makeFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" "VERSION=${commit}" ];
dontStrip = true;
- checkPhase = "./bcachefs version";
+ checkPhase = "./target/release/bcachefs version";
doCheck = true;
meta = {
diff --git a/src/commands/cmd_mount.rs b/src/commands/cmd_mount.rs
index c644767e..c845172d 100644
--- a/src/commands/cmd_mount.rs
+++ b/src/commands/cmd_mount.rs
@@ -137,7 +137,7 @@ pub struct Cli {
#[arg(short, long, default_value = "ask", verbatim_doc_comment)]
key_location: KeyLocation,
- /// Device, or UUID=<UUID>
+ /// Device, or UUID=\<UUID\>
dev: String,
/// Where the filesystem should be mounted. If not set, then the filesystem