Merge lp:~cldunlap1/ubuntu/natty/mountall/fix2-for-805509 into lp:ubuntu/natty/mountall

Proposed by Chad Dunlap
Status: Work in progress
Proposed branch: lp:~cldunlap1/ubuntu/natty/mountall/fix2-for-805509
Merge into: lp:ubuntu/natty/mountall
Diff against target: 88 lines (+59/-2)
2 files modified
debian/changelog (+12/-0)
man/mountall.8 (+47/-2)
To merge this branch: bzr merge lp:~cldunlap1/ubuntu/natty/mountall/fix2-for-805509
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+78135@code.launchpad.net

Description of the change

Added the changes that were requested, per the reveiwer, in lp: #805509 in July, forgot to do the merge request. Sorry all.

To post a comment you must log in.
Revision history for this message
James Hunt (jamesodhunt) wrote :

Just a couple of minor comments:

1) Ideally, there would be a space on line 62 - should be "1 second" (although I appreciate this space is missing in the output of "mountall --help" itself.

2) Is that email address in the changelog valid? Should it be "<email address hidden>"?

Revision history for this message
Chad Dunlap (cldunlap1) wrote :

On Friday, October 07, 2011 05:50:04 AM you wrote:
> Just a couple of minor comments:
>
> 1) Ideally, there would be a space on line 62 - should be "1 second"
> (although I appreciate this space is missing in the output of "mountall
> --help" itself.
>
> 2) Is that email address in the changelog valid? Should it be
> "<email address hidden>"?
If you want, I can just re-do the patch and push it back up with the correct
changes, in oneiric release rather than in natty.

You are correct, the email address should be <email address hidden>. I guess I
got excited. This was the first bug fix I attempted.

Let me know how you would like me to proceed.
--

Thank You,
Chad Dunlap

Revision history for this message
Stéphane Graber (stgraber) wrote :

Just updating the branch to contain a single changelog entry and the correct e-mail address would be perfect.

Thanks

Revision history for this message
Stéphane Graber (stgraber) wrote :

Marking the branch work in progress, please move it back to needs review when the changes are done.

Unmerged revisions

360. By Chad Dunlap <email address hidden>

Fixed the formatting issues from the previous commit. I also moved the 'OPTIONS' section below the 'DESCRIPTION' section per the advice of Colin Watson. This is a continuation of LP#805509.

359. By Chad Dunlap <email address hidden>

Added the 'OPTIONS' section to the man page (LP#805509)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-04-13 12:59:22 +0000
3+++ debian/changelog 2011-10-04 18:13:26 +0000
4@@ -1,3 +1,15 @@
5+mountall (2.25ubuntu4) natty; urgency=low
6+
7+ * Fixed the formatting issues from the previous commit. I also moved the 'OPTIONS' section below the 'DESCRIPTION' section per the advice of Colin Watson. This is a continuation of LP#805509.
8+
9+ -- Chad Dunlap <cldunlap@BA120470> Mon, 25 Jul 2011 16:25:49 -0400
10+
11+mountall (2.25ubuntu3) natty; urgency=low
12+
13+ * Added the 'OPTIONS' section to the man page (LP#805509)
14+
15+ -- Chad Dunlap <cldunlap@BA120470> Mon, 25 Jul 2011 12:29:18 -0400
16+
17 mountall (2.25ubuntu1) natty; urgency=low
18
19 * Fixed two errors found while browsing the code: 1) find_mount("/") returns
20
21=== modified file 'man/mountall.8'
22--- man/mountall.8 2009-09-16 22:38:18 +0000
23+++ man/mountall.8 2011-10-04 18:13:26 +0000
24@@ -6,6 +6,7 @@
25 .SH SYNOPSIS
26 .B mountall
27 .RI [ OPTIONS ]...
28+.
29 .\"
30 .SH DESCRIPTION
31 .B mountall
32@@ -16,10 +17,54 @@
33 .BR mount (8)
34 and
35 .BR swapon (8)
36-in the correct order to mount filesystems once the underlying devices
37+in the correct order to mount
38+filesystems once the underlying devices
39 have been created by
40 .BR udevd (8)
41-
42+.\"
43+.SH OPTIONS
44+.
45+.TP 20
46+.B \-\-daemon
47+Detach and run in the background
48+.
49+.TP 20
50+.B \-\-force\-fsck
51+Force check of all filesystems.
52+.
53+.TP 20
54+.B \-\-fsck\-fix
55+Attempt to fix all fsck errors.
56+.
57+.TP 20
58+.B \-\-no\-events
59+Do not emit events after mounting filesystems.
60+.TP 20
61+.B \-\-dev\-wait\-time\=value in seconds
62+(Default is 30 seconds, Legal value between 1second to 2147483647 seconds
63+.
64+.TP 20
65+In case of (bootwait,timeout): specify the time to wait for device to be detected
66+.
67+.TP 20
68+.B \-q, \-\-quiet
69+reduce output to errors only.
70+.
71+.TP 20
72+.B \-v, \-\-verbose
73+increase output to include informational messages.
74+.
75+.TP 20
76+.B \-\-help
77+display this help and exit.
78+.
79+.TP 20
80+.B \-\-version
81+output version information and exit.
82+.PP
83+By default, mountall does not detach from the console and remains in the foreground. Use
84+the \-\-daemon option to have it detach.
85+.\"
86 This is a temporary tool until
87 .BR init (8)
88 itself gains the necessary flexibility to perform this processing; you

Subscribers

People subscribed via source and target branches

to all changes: