summaryrefslogtreecommitdiffstats
path: root/usr.sbin/autofs/automount.c
diff options
context:
space:
mode:
authortrasz <trasz@FreeBSD.org>2015-05-21 13:37:48 +0000
committertrasz <trasz@FreeBSD.org>2015-05-21 13:37:48 +0000
commit936900ca6b2f1fb85a27937bb54a2ecbd681ffbd (patch)
tree57e7f2a19ec0d9b601a233145c2f690205f561e2 /usr.sbin/autofs/automount.c
parentffdd97ce45793ac2206ca85895ccf346c9fc4bbc (diff)
downloadFreeBSD-src-936900ca6b2f1fb85a27937bb54a2ecbd681ffbd.zip
FreeBSD-src-936900ca6b2f1fb85a27937bb54a2ecbd681ffbd.tar.gz
MFC r279916:
Make "automount -LL -o whatever" present options in the same order as used by automountd(8). Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'usr.sbin/autofs/automount.c')
-rw-r--r--usr.sbin/autofs/automount.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.sbin/autofs/automount.c b/usr.sbin/autofs/automount.c
index 8bcc79b..ce5d861 100644
--- a/usr.sbin/autofs/automount.c
+++ b/usr.sbin/autofs/automount.c
@@ -381,13 +381,12 @@ main_automount(int argc, char **argv)
parse_master(root, AUTO_MASTER_PATH);
if (show_maps) {
- root->n_options = concat(options, ',', root->n_options);
if (show_maps > 1) {
node_expand_indirect_maps(root);
node_expand_ampersand(root, NULL);
}
node_expand_defined(root);
- node_print(root);
+ node_print(root, options);
return (0);
}
OpenPOWER on IntegriCloud