public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cifs-utils: remove hard-coded path to 'systemd-ask-password' to close issue #353

Browse Source
This commit is contained in:
Peter Simons 2013-03-05 11:25:53 +01:00
parent 31c198a40e
commit 599cc3ec0a
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/cifs-utils/default.nix
View File

@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0f619nw1163bcmfc83mmqj31qdkl68wfm81vynx3d8q0m0k1ll7i"; sha256 = "0f619nw1163bcmfc83mmqj31qdkl68wfm81vynx3d8q0m0k1ll7i";
}; };
patches = [ ./find-systemd-ask-password-via-path.patch ];
makeFlags = "root_sbindir=$(out)/sbin"; makeFlags = "root_sbindir=$(out)/sbin";
meta = { meta = {

22
pkgs/os-specific/linux/cifs-utils/find-systemd-ask-password-via-path.patch Normal file
View File

@ -0,0 +1,22 @@
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
@@ -1634,7 +1634,7 @@
}
/*
- * If systemd is running and /bin/systemd-ask-password --
+ * If systemd is running and systemd-ask-password --
* is available, then use that else fallback on getpass(..)
*
* Returns: @input or NULL on error
@@ -1657,7 +1657,7 @@
FILE *ask_pass_fp = NULL;
cmd = ret = NULL;
- if (asprintf(&cmd, "/bin/systemd-ask-password \"%s\"", prompt) >= 0) {
+ if (asprintf(&cmd, "systemd-ask-password \"%s\"", prompt) >= 0) {
ask_pass_fp = popen (cmd, "re");
free (cmd);
}
Only in cifs-utils-5.9/: mount.cifs.c.orig