Merge lp://qastaging/~rlaager/ecryptfs/fix-lp-1574174 into lp://qastaging/ecryptfs
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~rlaager/ecryptfs/fix-lp-1574174 |
| Merge into: | lp://qastaging/ecryptfs |
| Diff against target: |
14 lines (+2/-2) 1 file modified
src/utils/ecryptfs-setup-private (+2/-2) |
| To merge this branch: | bzr merge lp://qastaging/~rlaager/ecryptfs/fix-lp-1574174 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tyler Hicks | Needs Fixing | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2016-04-25.
Description of the change
Fix improper "already mounted" errors with ZFS
The obvious approach for using ZFS and ecryptfs together involves
creating a dataset like this:
zfs create -o mountpoint=
As a result, /proc/mounts looks like this:
rpool/home/USER /home/.
ecryptfs-
which was effectively left-anchored. Unfortunately, this can match the
device column. A space at the beginning of the pattern corrects this.
I applied the same fix to the CRYPTDIR for consistency and correctness,
though I do not believe it was a practical problem in the same way.
| Tyler Hicks (tyhicks) wrote | # |
| Richard Laager (rlaager) wrote | # |
Unmerged revisions
- 881. By Richard Laager
-
Fix improper "already mounted" errors with ZFS
The obvious approach for using ZFS and ecryptfs together involves
creating a dataset like this:
zfs create -o mountpoint=/home/. ecryptfs/ USER rpool/home/USER As a result, /proc/mounts looks like this:
rpool/home/USER /home/.ecryptfs/ USER zfs rw,xattr 0 0 ecryptfs-
setup-private checked for existing mount points using a grep
which was effectively left-anchored. Unfortunately, this can match the
device column. A space at the beginning of the pattern corrects this.I applied the same fix to the CRYPTDIR for consistency and correctness,
though I do not believe it was a practical problem in the same way.
Hi Richard - Thanks for the merge proposal. I could be wrong because I didn't test this but I think adding a leading space to CRYPTDIR would break the "already mounted" check since CRYPTDIR is the device (or source) and will be listed at the beginning of a line in /proc/mounts. The check will never fail even if the CRYPTDIR is already mounted.