X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fexportfs%2Fexportfs.c;h=bd48e98fd4eaeb68fb9023dd7ac2a549b1e71510;hp=936dff5cebec56d140028b4af98aa29948a5030d;hb=d38ea02d0e4bcdc4e0114567028596f7bcba45b9;hpb=2d33968c66860ad772aac918992986fe4865b3a4

diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index 936dff5..bd48e98 100644
--- a/utils/exportfs/exportfs.c
+++ b/utils/exportfs/exportfs.c
@@ -147,6 +147,16 @@ exports_update(int verbose)
 	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",
@@ -366,6 +376,10 @@ dump(int verbose)
 				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)