646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
diff -uNr pam_mount-2.15_old/src/mtcrypt.c pam_mount-2.15/src/mtcrypt.c
|
|
--- pam_mount-2.15_old/src/mtcrypt.c 2015-07-04 16:00:12.917943336 +0200
|
|
+++ pam_mount-2.15/src/mtcrypt.c 2015-07-04 16:03:45.685302493 +0200
|
|
@@ -534,7 +534,7 @@
|
|
|
|
/* candidate for replacement by some libmount calls, I guess. */
|
|
argk = 0;
|
|
- mount_args[argk++] = "mount";
|
|
+ mount_args[argk++] = "@@NIX_UTILLINUX@@/mount";
|
|
if (opt->fstype != NULL) {
|
|
mount_args[argk++] = "-t";
|
|
mount_args[argk++] = opt->fstype;
|
|
@@ -668,7 +668,7 @@
|
|
|
|
if (!opt->no_update)
|
|
pmt_smtab_remove(mntpt, SMTABF_MOUNTPOINT);
|
|
- rmt_args[argk++] = "mount";
|
|
+ rmt_args[argk++] = "@@NIX_UTILLINUX@@/mount";
|
|
rmt_args[argk++] = "-o";
|
|
rmt_args[argk++] = opt->extra_opts;
|
|
rmt_args[argk++] = mntpt;
|
|
@@ -749,7 +749,7 @@
|
|
pmt_smtab_remove(mountpoint, SMTABF_MOUNTPOINT);
|
|
pmt_cmtab_remove(mountpoint);
|
|
|
|
- umount_args[argk++] = "umount";
|
|
+ umount_args[argk++] = "@@NIX_UTILLINUX@@/umount";
|
|
umount_args[argk++] = "-i";
|
|
umount_args[argk++] = mountpoint;
|
|
umount_args[argk] = NULL;
|