summary refs log tree commit diff
path: root/pkgs/os-specific/linux/cifs-utils
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2013-03-05 11:45:49 +0100
committerPeter Simons <simons@cryp.to>2013-03-05 11:46:01 +0100
commit7e99044638c639016d811708f5992f58de82807f (patch)
tree9d7871afd2c204c5222e3385237414a5e847f1c2 /pkgs/os-specific/linux/cifs-utils
parent8437673c91193a38c7bcd5021a87ed26edec432f (diff)
downloadnixpkgs-7e99044638c639016d811708f5992f58de82807f.tar
nixpkgs-7e99044638c639016d811708f5992f58de82807f.tar.gz
nixpkgs-7e99044638c639016d811708f5992f58de82807f.tar.bz2
nixpkgs-7e99044638c639016d811708f5992f58de82807f.tar.lz
nixpkgs-7e99044638c639016d811708f5992f58de82807f.tar.xz
nixpkgs-7e99044638c639016d811708f5992f58de82807f.tar.zst
nixpkgs-7e99044638c639016d811708f5992f58de82807f.zip
cifs-utils: hard-code path '/run/current-system/sw/bin/systemd-ask-password' to fix issue #353 some more
It turns out that mount.cifs is run in a shell environment that doesn't have
$PATH. To find that program, we must commit to some location. The path I used will
work fine on NixOS, but of course it won't work on other Linux distributions. I'm
not sure whether that's an important issue or not.
Diffstat (limited to 'pkgs/os-specific/linux/cifs-utils')
-rw-r--r--pkgs/os-specific/linux/cifs-utils/find-systemd-ask-password-via-path.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/cifs-utils/find-systemd-ask-password-via-path.patch b/pkgs/os-specific/linux/cifs-utils/find-systemd-ask-password-via-path.patch
index 53b473c2822..428cb75edad 100644
--- a/pkgs/os-specific/linux/cifs-utils/find-systemd-ask-password-via-path.patch
+++ b/pkgs/os-specific/linux/cifs-utils/find-systemd-ask-password-via-path.patch
@@ -1,6 +1,6 @@
 diff -ubr cifs-utils-5.9-orig/mount.cifs.c cifs-utils-5.9/mount.cifs.c
 --- cifs-utils-5.9-orig/mount.cifs.c	2013-03-05 10:53:19.375464790 +0100
-+++ cifs-utils-5.9/mount.cifs.c	2013-03-05 11:21:06.602624390 +0100
++++ cifs-utils-5.9/mount.cifs.c	2013-03-05 11:41:40.704946110 +0100
 @@ -1634,7 +1634,7 @@
  }
  
@@ -15,7 +15,7 @@ diff -ubr cifs-utils-5.9-orig/mount.cifs.c cifs-utils-5.9/mount.cifs.c
  
  		cmd = ret = NULL;
 -		if (asprintf(&cmd, "/bin/systemd-ask-password \"%s\"", prompt) >= 0) {
-+		if (asprintf(&cmd, "systemd-ask-password \"%s\"", prompt) >= 0) {
++		if (asprintf(&cmd, "/run/current-system/sw/bin/systemd-ask-password \"%s\"", prompt) >= 0) {
  			ask_pass_fp = popen (cmd, "re");
  			free (cmd);
  		}