Merge lp://staging/~serge-hallyn/ecryptfs/emountjan.2010 into lp://staging/~ecryptfs/ecryptfs/oldtrunk
Proposed by
Serge Hallyn
Status: | Merged |
---|---|
Merge reported by: | Dustin Kirkland |
Merged at revision: | not available |
Proposed branch: | lp://staging/~serge-hallyn/ecryptfs/emountjan.2010 |
Merge into: | lp://staging/~ecryptfs/ecryptfs/oldtrunk |
Diff against target: |
649 lines (+584/-2) 5 files modified
debian/changelog (+6/-0) debian/lintian/ecryptfs-utils (+1/-0) debian/rules (+2/-1) src/utils/Makefile.am (+7/-1) src/utils/emount.c (+568/-0) |
To merge this branch: | bzr merge lp://staging/~serge-hallyn/ecryptfs/emountjan.2010 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dustin Kirkland | Needs Fixing | ||
Review via email: mp+45079@code.staging.launchpad.net |
Description of the change
Define emount (as discussed, likely to be renamed ecryptfs-mount).
To post a comment you must log in.
Per discussion at the coffee shop on 360 on Thursday last week, I'm marking this "needs fixing".
Serge is going to merge his new code into mount.ecryptfs_ private. c, which currently takes no arguments in as argv/argc. He will add some conditional support to the top of main() that tests argc, and if argument(s) is/are found, then it will operate according to his new mechanism (with configurable mounts), and if none are found, then it will operate in legacy mode.
Get this merge back to me at least a few days before Natty Feature Freeze and it should make 11.04 no problem! Thanks!