]>
Commit | Line | Data |
---|---|---|
3d551623 PG |
1 | diff --git a/CHANGELOG b/CHANGELOG |
2 | index d66b8fc..8df22ae 100644 | |
3 | --- a/CHANGELOG | |
4 | +++ b/CHANGELOG | |
5 | @@ -4,6 +4,8 @@ | |
6 | - correct initialization of local var in parse_server_string. | |
7 | - add missing "multi" map support. | |
8 | - add multi nsswitch lookup. | |
9 | +- change random multiple server selection option name to be consistent | |
10 | + with existing downstream version 4 naming. | |
11 | ||
12 | 18/06/2007 autofs-5.0.2 | |
13 | ----------------------- | |
14 | diff --git a/daemon/automount.c b/daemon/automount.c | |
15 | index 3e40428..294c511 100644 | |
16 | --- a/daemon/automount.c | |
17 | +++ b/daemon/automount.c | |
18 | @@ -1367,7 +1367,7 @@ static void usage(void) | |
19 | " -d --debug log debuging info\n" | |
20 | " -D --define define global macro variable\n" | |
21 | /*" -f --foreground do not fork into background\n" */ | |
22 | - " -r --random-replicated-selection\n" | |
23 | + " -r --random-multimount-selection\n" | |
24 | " use ramdom replicated server selection\n" | |
25 | " -O --global-options\n" | |
26 | " specify global mount options\n" | |
27 | @@ -1469,7 +1469,7 @@ int main(int argc, char *argv[]) | |
28 | {"debug", 0, 0, 'd'}, | |
29 | {"define", 1, 0, 'D'}, | |
30 | {"foreground", 0, 0, 'f'}, | |
31 | - {"random-selection", 0, 0, 'r'}, | |
32 | + {"random-multimount-selection", 0, 0, 'r'}, | |
33 | {"global-options", 1, 0, 'O'}, | |
34 | {"version", 0, 0, 'V'}, | |
35 | {0, 0, 0, 0} | |
36 | diff --git a/man/automount.8 b/man/automount.8 | |
37 | index b01be83..fc1846a 100644 | |
38 | --- a/man/automount.8 | |
39 | +++ b/man/automount.8 | |
40 | @@ -47,7 +47,7 @@ Define a global macro substitution variable. Global definitions | |
41 | are over-ridden macro definitions of the same name specified in | |
42 | mount entries. | |
43 | .TP | |
44 | -.I "\-r, \-\-random-replicated-selection" | |
45 | +.I "\-r, \-\-random-multimount-selection" | |
46 | Enables the use of ramdom selection when choosing a host from a | |
47 | list of replicated servers. | |
48 | .TP |