Fix handling of explicit uuid

[nfs-utils.git] / support / nfs / exports.c

diff --git a/support/nfs/exports.c b/support/nfs/exports.c
index 6b567081123edee90f976fd508847df6381ff4c6..334c08e1642051210c10f35a1137b9ae5999e8fd 100644 (file)
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@ -595,7 +595,7 @@ bad_option:
                                if (opt[5]!='\0' && *oe == '\0') 
                                        ep->e_flags |= NFSEXP_FSID;
                                else if (valid_uuid(opt+5))
-                                       ep->e_uuid = strdup(opt+7);
+                                       ep->e_uuid = strdup(opt+5);
                                else {
                                        xlog(L_ERROR, "%s: %d: bad fsid \"%s\"\n",
                                             flname, flline, opt);      
@@ -641,6 +641,12 @@ bad_option:
                while (isblank(*cp))
                        cp++;
        }
+       /*
+        * Turn on nohide which will allow this export to cross over
+        * the 'mount --bind' mount point.
+        */
+       if (ep->e_fslocdata)
+               ep->e_flags |= NFSEXP_NOHIDE;
 
        for (p = ep->e_secinfo; p->flav; p++)
                p->flags |= ep->e_flags & ~NFSEXP_SECINFO_FLAGS;