diff options
| author | koverstreet <kent.overstreet@gmail.com> | 2024-01-23 02:53:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-23 02:53:21 -0500 |
| commit | 39e109e5f9d484e41f4767d4d01064686131e010 (patch) | |
| tree | 72c474a1af225796991e3698f01588288b459a24 | |
| parent | 3da247cd20da37a4d3f4d957a30293261c0e38e2 (diff) | |
| parent | de191cd19cadf47a0e9d71da0b3cef72bcff25ae (diff) | |
Merge pull request #220 from ElvishJerricco/fix-nix-and-docs
Fix nix and docs
| -rw-r--r-- | build.nix | 4 | ||||
| -rw-r--r-- | src/commands/cmd_mount.rs | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -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 |