Merge lp://staging/~jelmer/ubuntu/natty/samba/596064-nmb-fails-to-start into lp://staging/ubuntu/natty/samba
Proposed by
Jelmer Vernooij
| Status: | Merged |
|---|---|
| Merge reported by: | Jelmer Vernooij |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~jelmer/ubuntu/natty/samba/596064-nmb-fails-to-start |
| Merge into: | lp://staging/ubuntu/natty/samba |
| Diff against target: |
32 lines (+9/-2) 2 files modified
debian/changelog (+7/-0) debian/samba.nmbd.upstart (+2/-2) |
| To merge this branch: | bzr merge lp://staging/~jelmer/ubuntu/natty/samba/596064-nmb-fails-to-start |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Sponsors | Pending | ||
|
Review via email:
|
|||
Description of the change
This trivially fixes bug 596064 by creating /var/run/samba before using testparm.
If /var/run/samba does not exist testparm will return non-zero, thus making upstart skip the rest of the pre-start script and not starting nmbd, irregardless of the contents of 'disable netbios'.
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
