colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

/mnt/servo/*: fix for curl 8.9.0

Browse Source 
see: <https://github.com/curl/curl/discussions/14299>
This commit is contained in:
Colin
2024-08-20 09:53:37 +00:00
parent 17dcf566f7
commit 9c9b237e69
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hosts/common/fs.nix
View File

@@ -183,6 +183,7 @@ let
# drop_privileges: after `mount.fuse3` opens /dev/fuse, it will drop all capabilities before invoking sshfs # drop_privileges: after `mount.fuse3` opens /dev/fuse, it will drop all capabilities before invoking sshfs
"drop_privileges" "drop_privileges"
"auto_unmount" #< ensures that when the fs exits, it releases its mountpoint. then systemd can recognize it as failed. "auto_unmount" #< ensures that when the fs exits, it releases its mountpoint. then systemd can recognize it as failed.
"interface=0.0.0.0" #< see: <https://github.com/curl/curl/discussions/14299>
]; ];
# fsType = "nfs"; # fsType = "nfs";
# options = fsOpts.nfs ++ fsOpts.lazyMount; # options = fsOpts.nfs ++ fsOpts.lazyMount;
@@ -240,7 +241,10 @@ let
"ftp://servo-hn:/${subdir}" "ftp://servo-hn:/${subdir}"
"/dev/null" "/dev/null"
"-o" "-o"
(lib.concatStringsSep "," ([ "exit_after_connect" ] ++ config.fileSystems."${localPath}".options)) (lib.concatStringsSep "," ([
"exit_after_connect"
"interface=0.0.0.0" #< see: <https://github.com/curl/curl/discussions/14299>
] ++ config.fileSystems."${localPath}".options))
]; ];
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";

4
pkgs/additional/curlftpfs-sane/default.nix
View File

@@ -16,8 +16,8 @@
domain = "git.uninsane.org"; domain = "git.uninsane.org";
owner = "colin"; owner = "colin";
repo = "curlftpfs"; repo = "curlftpfs";
rev = "fuse3"; rev = "master";
hash = "sha256-QwGbQuriNwnZscnYBEVp3Td6/ifiA8rtQcvtvmTnpbU="; hash = "sha256-bqkRHV4d1y349yIHAtXPMlfWciVCH/geW73id8aJwUs=";
}; };
# `mount` clears PATH before calling the mount helper (see util-linux/lib/env.c), # `mount` clears PATH before calling the mount helper (see util-linux/lib/env.c),
# so the traditional /etc/fstab approach of fstype=fuse and device = curlftpfs#URI doesn't work. # so the traditional /etc/fstab approach of fstype=fuse and device = curlftpfs#URI doesn't work.