BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #75303 from tobim/pkgs/kbfs-fusermount

Browse source 
kbfs: don't use store path for fusermount
This commit is contained in:
Sarah Brofeldt 2019-12-09 16:58:51 +01:00 committed by GitHub
commit 3a6bedb60e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
pkgs/tools/security/keybase/fix-paths-kbfs.patch
View file

@ -1,48 +0,0 @@
diff --git a/go/kbfs/libfuse/mounter.go b/go/kbfs/libfuse/mounter.go
index d791ffc2..b116ad5d 100644
--- a/go/kbfs/libfuse/mounter.go
+++ b/go/kbfs/libfuse/mounter.go
@@ -108,7 +108,7 @@ func (m *mounter) Unmount() (err error) {
case "darwin":
_, err = exec.Command("/sbin/umount", dir).Output()
case "linux":
- fusermountOutput, fusermountErr := exec.Command("fusermount", "-u", dir).CombinedOutput()
+ fusermountOutput, fusermountErr := exec.Command("@fusermount@", "-u", dir).CombinedOutput()
// Only clean up mountdir on a clean unmount.
if fusermountErr == nil {
m.log.Info("Successfully unmounted")
@@ -135,7 +135,7 @@ func (m *mounter) Unmount() (err error) {
"/usr/sbin/diskutil", "unmountDisk", "force", dir).Output()
case "linux":
// Lazy unmount; will unmount when KBFS is no longer in use.
- _, err = exec.Command("fusermount", "-u", "-z", dir).Output()
+ _, err = exec.Command("@fusermount@", "-u", "-z", dir).Output()
default:
err = errors.New("Forced unmount is not supported on this platform yet")
}
diff --git a/go/vendor/bazil.org/fuse/mount_linux.go b/go/vendor/bazil.org/fuse/mount_linux.go
index ec7fd89c..4d0a9e30 100644
--- a/go/vendor/bazil.org/fuse/mount_linux.go
+++ b/go/vendor/bazil.org/fuse/mount_linux.go
@@ -196,7 +196,7 @@ func mount(dir string, conf *mountConfig, ready chan<- struct{}, _ *error) (fuse
defer readFile.Close()
cmd := exec.Command(
- "fusermount",
+ "@fusermount@",
"-o", conf.getOptions(),
"--",
dir,
diff --git a/go/vendor/bazil.org/fuse/unmount_linux.go b/go/vendor/bazil.org/fuse/unmount_linux.go
index f02448af..6e4c6c23 100644
--- a/go/vendor/bazil.org/fuse/unmount_linux.go
+++ b/go/vendor/bazil.org/fuse/unmount_linux.go
@@ -21,7 +21,7 @@ func unmount(dir string) error {
return sysunix.Unmount(dir, sysunix.MNT_DETACH)
}
- cmd := exec.Command("fusermount", "-u", dir)
+ cmd := exec.Command("@fusermount@", "-u", dir)
output, err := cmd.CombinedOutput()
if err != nil {
if len(output) > 0 {

9
pkgs/tools/security/keybase/kbfs.nix
View file

@ -1,4 +1,4 @@
{ stdenv, substituteAll, buildGoPackage, fetchFromGitHub, fuse, osxfuse, keybase }:
{ stdenv, buildGoPackage, fetchFromGitHub, keybase }:
buildGoPackage {
pname = "kbfs";
@ -10,13 +10,6 @@ buildGoPackage {
dontRenameImports = true;
patches = [
(substituteAll {
src = ./fix-paths-kbfs.patch;
fusermount = "${fuse}/bin/fusermount";
})
];
buildFlags = [ "-tags production" ];
meta = with stdenv.lib; {