fprintf(stderr, "exportfs: -r and -u are incompatible.\n");
return 1;
}
+ new_cache = check_new_cache();
if (optind == argc && ! f_all) {
- xtab_export_read();
- dump(f_verbose);
- return 0;
+ if (force_flush) {
+ if (new_cache)
+ cache_flush(1);
+ else {
+ fprintf(stderr, "exportfs: -f: only available with new cache controls: mount /proc/fs/nfsd first\n");
+ exit(1);
+ }
+ return 0;
+ } else {
+ xtab_export_read();
+ dump(f_verbose);
+ return 0;
+ }
}
- new_cache = check_new_cache();
-
if (f_export && ! f_ignore)
export_read(_PATH_EXPORTS);
if (f_export) {
if (!f_export)
for (i = optind ; i < argc ; i++)
unexportfs(argv[i], f_verbose);
- rmtab_read();
+ if (!new_cache)
+ rmtab_read();
}
if (!new_cache) {
xtab_mount_read();
nfs_export *exp;
for (exp = exportlist[MCL_FQDN]; exp; exp=exp->m_next) {
+ /* check mountpoint option */
+ if (exp->m_mayexport &&
+ exp->m_export.e_mountpoint &&
+ !is_mountpoint(exp->m_export.e_mountpoint[0]?
+ exp->m_export.e_mountpoint:
+ exp->m_export.e_path)) {
+ printf("%s not exported as %s not a mountpoint.\n",
+ exp->m_export.e_path, exp->m_export.e_mountpoint);
+ exp->m_mayexport = 0;
+ }
if (exp->m_mayexport && ((exp->m_exported<1) || exp->m_changed)) {
if (verbose)
printf("%sexporting %s:%s to kernel\n",
for (exp = exportlist[htype]; exp; exp = exp->m_next) {
if (path && strcmp(path, exp->m_export.e_path))
continue;
- if (htype != exp->m_client->m_type
- || (htype == MCL_FQDN
- && !matchhostname(exp->m_export.e_hostname,
- hname)))
+ if (htype != exp->m_client->m_type)
+ continue;
+ if (htype == MCL_FQDN
+ && !matchhostname(exp->m_export.e_hostname,
+ hname))
+ continue;
+ if (htype != MCL_FQDN
+ && strcasecmp(exp->m_export.e_hostname, hname))
continue;
if (verbose) {
#if 0
c = dumpopt(c, "wdelay");
if (ep->e_flags & NFSEXP_NOHIDE)
c = dumpopt(c, "nohide");
- if (ep->e_flags & NFSEXP_CROSSMNT)
+ if (ep->e_flags & NFSEXP_CROSSMOUNT)
c = dumpopt(c, "crossmnt");
if (ep->e_flags & NFSEXP_INSECURE_PORT)
c = dumpopt(c, "insecure");
c = dumpopt(c, "insecure_locks");
if (ep->e_flags & NFSEXP_FSID)
c = dumpopt(c, "fsid=%d", ep->e_fsid);
+ if (ep->e_mountpoint)
+ c = dumpopt(c, "mountpoint%s%s",
+ ep->e_mountpoint[0]?"=":"",
+ ep->e_mountpoint);
if (ep->e_maptype == CLE_MAP_UGIDD)
c = dumpopt(c, "mapping=ugidd");
else if (ep->e_maptype == CLE_MAP_FILE)