Merge lp://qastaging/~csurbhi/ubuntu/natty/mountall/mountall-error.fix into lp://qastaging/ubuntu/natty/mountall
Proposed by
Surbhi Palande
| Status: | Merged |
|---|---|
| Merge reported by: | Marc Deslauriers |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~csurbhi/ubuntu/natty/mountall/mountall-error.fix |
| Merge into: | lp://qastaging/ubuntu/natty/mountall |
| Diff against target: |
40 lines (+11/-2) 2 files modified
debian/changelog (+9/-0) src/mountall.c (+2/-2) |
| To merge this branch: | bzr merge lp://qastaging/~csurbhi/ubuntu/natty/mountall/mountall-error.fix |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
This change fixes two errors that I encountered while code browsing/testing.
1) find_mount("/") returns NULL when / is not found, so cannot access root->mounted (as root is NULL in this case)
2) In activate_timer(): the information message about the dev_wait_timeout should be printed after
dev_
Please consider merging this for natty.
To post a comment you must log in.
Revision history for this message
| Marc Deslauriers (mdeslaur) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks like this already got merged, so setting status to "merged".