at 23.11-beta 30 lines 1.0 kB view raw
1diff -uNr pam_mount-2.15_old/src/mtcrypt.c pam_mount-2.15/src/mtcrypt.c 2--- pam_mount-2.15_old/src/mtcrypt.c 2015-07-04 16:00:12.917943336 +0200 3+++ pam_mount-2.15/src/mtcrypt.c 2015-07-04 16:03:45.685302493 +0200 4@@ -534,7 +534,7 @@ 5 6 /* candidate for replacement by some libmount calls, I guess. */ 7 argk = 0; 8- mount_args[argk++] = "mount"; 9+ mount_args[argk++] = "@@NIX_UTILLINUX@@/mount"; 10 if (opt->fstype != NULL) { 11 mount_args[argk++] = "-t"; 12 mount_args[argk++] = opt->fstype; 13@@ -668,7 +668,7 @@ 14 15 if (!opt->no_update) 16 pmt_smtab_remove(mntpt, SMTABF_MOUNTPOINT); 17- rmt_args[argk++] = "mount"; 18+ rmt_args[argk++] = "@@NIX_UTILLINUX@@/mount"; 19 rmt_args[argk++] = "-o"; 20 rmt_args[argk++] = opt->extra_opts; 21 rmt_args[argk++] = mntpt; 22@@ -749,7 +749,7 @@ 23 pmt_smtab_remove(mountpoint, SMTABF_MOUNTPOINT); 24 pmt_cmtab_remove(mountpoint); 25 26- umount_args[argk++] = "umount"; 27+ umount_args[argk++] = "@@NIX_UTILLINUX@@/umount"; 28 umount_args[argk++] = "-i"; 29 umount_args[argk++] = mountpoint; 30 umount_args[argk] = NULL;