From 26d6b3464a71e79454b42a088c49d5e767a0fe45 Mon Sep 17 00:00:00 2001
From: Kayla Firestack <dev@kaylafire.me>
Date: Mon, 18 Oct 2021 12:21:23 -0400
Subject: [PATCH] move mount into rust-src, add to overlay

---
 nix/overlay.nix                                     | 1 +
 {mount => rust-src/mount}/Cargo.lock                | 0
 {mount => rust-src/mount}/Cargo.toml                | 0
 {mount => rust-src/mount}/build.rs                  | 0
 {mount => rust-src/mount}/src/filesystem.rs         | 0
 {mount => rust-src/mount}/src/key.rs                | 0
 {mount => rust-src/mount}/src/keyutils_wrapper.h    | 0
 {mount => rust-src/mount}/src/lib.rs                | 0
 {mount => rust-src/mount}/src/libbcachefs_wrapper.h | 0
 9 files changed, 1 insertion(+)
 rename {mount => rust-src/mount}/Cargo.lock (100%)
 rename {mount => rust-src/mount}/Cargo.toml (100%)
 rename {mount => rust-src/mount}/build.rs (100%)
 rename {mount => rust-src/mount}/src/filesystem.rs (100%)
 rename {mount => rust-src/mount}/src/key.rs (100%)
 rename {mount => rust-src/mount}/src/keyutils_wrapper.h (100%)
 rename {mount => rust-src/mount}/src/lib.rs (100%)
 rename {mount => rust-src/mount}/src/libbcachefs_wrapper.h (100%)

diff --git a/nix/overlay.nix b/nix/overlay.nix
index f1a7cb13..f84b6036 100644
--- a/nix/overlay.nix
+++ b/nix/overlay.nix
@@ -14,6 +14,7 @@ final: prev: {
 			debugMode = true;
 		};
 
+		mount = final.callPackage ../rust-src/mount {};
 		kernelPackages = final.recurseIntoAttrs (final.linuxPackagesFor final.bcachefs.kernel);
 		kernel = final.callPackage ./bcachefs-kernel.nix {
 			commit = final.bcachefs.tools.bcachefs_revision;
diff --git a/mount/Cargo.lock b/rust-src/mount/Cargo.lock
similarity index 100%
rename from mount/Cargo.lock
rename to rust-src/mount/Cargo.lock
diff --git a/mount/Cargo.toml b/rust-src/mount/Cargo.toml
similarity index 100%
rename from mount/Cargo.toml
rename to rust-src/mount/Cargo.toml
diff --git a/mount/build.rs b/rust-src/mount/build.rs
similarity index 100%
rename from mount/build.rs
rename to rust-src/mount/build.rs
diff --git a/mount/src/filesystem.rs b/rust-src/mount/src/filesystem.rs
similarity index 100%
rename from mount/src/filesystem.rs
rename to rust-src/mount/src/filesystem.rs
diff --git a/mount/src/key.rs b/rust-src/mount/src/key.rs
similarity index 100%
rename from mount/src/key.rs
rename to rust-src/mount/src/key.rs
diff --git a/mount/src/keyutils_wrapper.h b/rust-src/mount/src/keyutils_wrapper.h
similarity index 100%
rename from mount/src/keyutils_wrapper.h
rename to rust-src/mount/src/keyutils_wrapper.h
diff --git a/mount/src/lib.rs b/rust-src/mount/src/lib.rs
similarity index 100%
rename from mount/src/lib.rs
rename to rust-src/mount/src/lib.rs
diff --git a/mount/src/libbcachefs_wrapper.h b/rust-src/mount/src/libbcachefs_wrapper.h
similarity index 100%
rename from mount/src/libbcachefs_wrapper.h
rename to rust-src/mount/src/libbcachefs_wrapper.h