Commit 65191bc5 authored by Mike Hibler's avatar Mike Hibler

Need a different export pattern when ZFS_NOEXPORTS is used.

We won't get "NFS exported" in the mount output because there are
no static exports of the filesystems in this config.

Also, fixed the RE in the default pattern. It just happened to work
due to the way it was constructed.
parent f36382aa
#!/usr/bin/perl -wT
#
# Copyright (c) 2000-2014 University of Utah and the Flux Group.
# Copyright (c) 2000-2015 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -87,7 +87,16 @@ my @row;
# For determining file server mountpoints (XXX BSD specific)
my $MOUNTPROG = ($LINUX_FSNODE ? "/bin/mount" : "/sbin/mount");
# Need the linux equiv for this.
my $EXPORT_PAT = q(on ([\S]+)\s\(.*NFS exported.*\));
my $EXPORT_PAT = q(on ([\S]+)\s\\\(.*NFS exported.*\\\));
#
# XXX If there are no static exports (to boss) for filesystems, then
# "NFS exported" will not be set. Instead we just look for all mounted
# ufs or zfs filesystems.
#
if ($ZFS_NOEXPORT) {
$EXPORT_PAT = q(on ([\S]+)\s\\\([uz]fs,.*\\\));
}
#
# Testbed doesn't support changing exports file
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment