← Back to branch summary

~ecryptfs/ecryptfs/trunk

« back to all changes in this revision

Viewing changes to src/utils/ecryptfs-setup-private

  • Committer: Tyler Hicks
  • Date: 2016-04-25 22:58:38 UTC
  • mfrom: (880.1.1 ecryptfs)
  • Revision ID: tyhicks@canonical.com-20160425225838-2sepp5w5z1i63zhw
https://launchpad.net/bugs/1574174
[ Richard Laager ]
* src/utils/ecryptfs-setup-private: LP: #1574174
  - Adjust the test for discovering already active mount point destinations
    so that it doesn't accidentally match mount point sources.
  - Fixes ecryptfs-setup-private issue when attempting to use ZFS and
    eCryptfs together

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/utils/ecryptfs-setup-private
231
231
fi
232
232
 
233
233
# Check for active mounts
234
 
grep -qs "$MOUNTPOINT " /proc/mounts && error "[$MOUNTPOINT]" "$(gettext 'is already mounted')"
 
234
grep -qs " $MOUNTPOINT " /proc/mounts && error "[$MOUNTPOINT]" "$(gettext 'is already mounted')"
235
235
grep -qs "$CRYPTDIR " /proc/mounts && error "[$CRYPTDIR]" "$(gettext 'is already mounted')"
236
236
 
237
237
# Check that the mount point and encrypted directory are empty (skip symlinks).