|
Line
Link Here
|
|
-- |
|
|
| 1 |
modules/mount_bind.c | 9 ++++----- |
|
modules/mount_bind.c | 9 ++++----- |
| 2 |
modules/mount_changer.c | 6 +++--- |
1 |
modules/mount_changer.c | 6 +++--- |
| 3 |
modules/mount_ext2.c | 6 +++--- |
2 |
modules/mount_ext2.c | 6 +++--- |
| 4 |
modules/mount_generic.c | 4 ++-- |
3 |
modules/mount_generic.c | 4 ++-- |
| 5 |
4 files changed, 12 insertions(+), 13 deletions(-) |
4 |
4 files changed, 12 insertions(+), 13 deletions(-) |
| 6 |
-- a/modules/mount_bind.c |
5 |
++ b/modules/mount_bind.c |
|
Lines 158-170
int mount_mount(struct autofs_point *ap,
Link Here
|
| 158 |
if (!status) |
158 |
if (!status) |
| 159 |
existed = 0; |
159 |
existed = 0; |
| 160 |
|
160 |
|
| 161 |
debug(ap->logopt, |
161 |
debug(ap->logopt, MODPREFIX |
| 162 |
MODPREFIX |
162 |
"calling mount --bind -o %s %s %s", |
| 163 |
"calling mount --bind " SLOPPY " -o %s %s %s", |
|
|
| 164 |
options, what, fullpath); |
163 |
options, what, fullpath); |
| 165 |
|
164 |
|
| 166 |
err = spawn_bind_mount(ap->logopt, |
165 |
err = spawn_bind_mount(ap->logopt, "-o", |
| 167 |
SLOPPYOPT "-o", options, what, fullpath, NULL); |
166 |
options, what, fullpath, NULL); |
| 168 |
|
167 |
|
| 169 |
if (err) { |
168 |
if (err) { |
| 170 |
if (ap->type != LKP_INDIRECT) |
169 |
if (ap->type != LKP_INDIRECT) |
| 171 |
-- a/modules/mount_changer.c |
170 |
++ b/modules/mount_changer.c |
|
Lines 103-114
int mount_mount(struct autofs_point *ap,
Link Here
|
| 103 |
} |
103 |
} |
| 104 |
|
104 |
|
| 105 |
if (options && options[0]) { |
105 |
if (options && options[0]) { |
| 106 |
debug(ap->logopt, |
106 |
debug(ap->logopt, MODPREFIX |
| 107 |
MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s", |
107 |
"calling mount -t %s -o %s %s %s", |
| 108 |
fstype, options, what, fullpath); |
108 |
fstype, options, what, fullpath); |
| 109 |
|
109 |
|
| 110 |
err = spawn_mount(ap->logopt, "-t", fstype, |
110 |
err = spawn_mount(ap->logopt, "-t", fstype, |
| 111 |
SLOPPYOPT "-o", options, what, fullpath, NULL); |
111 |
"-o", options, what, fullpath, NULL); |
| 112 |
} else { |
112 |
} else { |
| 113 |
debug(ap->logopt, |
113 |
debug(ap->logopt, |
| 114 |
MODPREFIX "calling mount -t %s %s %s", |
114 |
MODPREFIX "calling mount -t %s %s %s", |
| 115 |
-- a/modules/mount_ext2.c |
115 |
++ b/modules/mount_ext2.c |
|
Lines 116-126
int mount_mount(struct autofs_point *ap,
Link Here
|
| 116 |
} |
116 |
} |
| 117 |
|
117 |
|
| 118 |
if (options) { |
118 |
if (options) { |
| 119 |
debug(ap->logopt, |
119 |
debug(ap->logopt, MODPREFIX |
| 120 |
MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s", |
120 |
"calling mount -t %s -o %s %s %s", |
| 121 |
fstype, options, what, fullpath); |
121 |
fstype, options, what, fullpath); |
| 122 |
err = spawn_mount(ap->logopt, "-t", fstype, |
122 |
err = spawn_mount(ap->logopt, "-t", fstype, |
| 123 |
SLOPPYOPT "-o", options, what, fullpath, NULL); |
123 |
"-o", options, what, fullpath, NULL); |
| 124 |
} else { |
124 |
} else { |
| 125 |
debug(ap->logopt, |
125 |
debug(ap->logopt, |
| 126 |
MODPREFIX "calling mount -t %s %s %s", |
126 |
MODPREFIX "calling mount -t %s %s %s", |
| 127 |
-- a/modules/mount_generic.c |
127 |
++ b/modules/mount_generic.c |
|
Lines 97-107
int mount_mount(struct autofs_point *ap,
Link Here
|
| 97 |
|
97 |
|
| 98 |
if (options && options[0]) { |
98 |
if (options && options[0]) { |
| 99 |
debug(ap->logopt, |
99 |
debug(ap->logopt, |
| 100 |
MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s", |
100 |
MODPREFIX "calling mount -t %s -o %s %s %s", |
| 101 |
fstype, options, loc, fullpath); |
101 |
fstype, options, loc, fullpath); |
| 102 |
|
102 |
|
| 103 |
err = spawn_mount(ap->logopt, "-t", fstype, |
103 |
err = spawn_mount(ap->logopt, "-t", fstype, |
| 104 |
SLOPPYOPT "-o", options, loc, fullpath, NULL); |
104 |
"-o", options, loc, fullpath, NULL); |
| 105 |
} else { |
105 |
} else { |
| 106 |
debug(ap->logopt, MODPREFIX "calling mount -t %s %s %s", |
106 |
debug(ap->logopt, MODPREFIX "calling mount -t %s %s %s", |
| 107 |
fstype, loc, fullpath); |
107 |
fstype, loc, fullpath); |
