Merge lp://staging/~xnox/ubuntu/quantal/shadow/clear-locks into lp://staging/ubuntu/quantal/shadow
Proposed by
Dimitri John Ledkov
| Status: | Merged |
|---|---|
| Merged at revision: | 49 |
| Proposed branch: | lp://staging/~xnox/ubuntu/quantal/shadow/clear-locks |
| Merge into: | lp://staging/ubuntu/quantal/shadow |
| Diff against target: |
50 lines (+27/-0) 3 files modified
debian/changelog (+7/-0) debian/passwd.upstart (+18/-0) debian/rules (+2/-0) |
| To merge this branch: | bzr merge lp://staging/~xnox/ubuntu/quantal/shadow/clear-locks |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Steve Langasek | Approve | ||
|
Review via email:
|
|||
Description of the change
* clear passwd and group locks on bootup.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Minor suggestions for improvement:
+start on filesystem
I thought about this a couple times, because we know that /etc is always on the root filesystem so we don't need to wait for the whole filesystem to be mounted before doing this. However, this particular job isn't critical-path for booting so it's better to run it later - especially since 'start on mounted MOUNTPOINT=/' would delay mountall from handling other mounts while this job was running.
+script
+ rm -f /etc/gshadow.lock /etc/shadow.lock /etc/passwd.lock /etc/group.lock
+end script
Micro-optimisation: this should be 'exec rm -f /etc/gshadow.lock /etc/shadow.lock /etc/passwd.lock /etc/group.lock' to avoid spawning a subshell unnecessarily.