DEVEL15-namei-allow-zfs-20070320

don't force AlwaysAttach on ZFS in namei

(cherry picked from commit af0a976f1151f7ca7642013357d1dcc7267c6457)

diff --git a/src/vol/partition.c b/src/vol/partition.c
index 9eea9f5..02764d3 100644 (file)
--- a/src/vol/partition.c
+++ b/src/vol/partition.c
@@ -460,8 +460,15 @@ VAttachPartitions(void)
     }
     while (!getmntent(mntfile, &mnt)) {
        /* Ignore non ufs or non read/write partitions */
-       if ((strcmp(mnt.mnt_fstype, "ufs") != 0)
-           || (strncmp(mnt.mnt_mntopts, "ro,ignore", 9) == 0))
+       /* but allow zfs too if we're in the NAMEI environment */
+       if (
+#ifdef AFS_NAMEI_ENV
+       ((!strcmp(mnt.mnt_fstype, "ufs") &&
+         !strcmp(mnt.mnt_fstype, "zfs")))
+#else
+       (strcmp(mnt.mnt_fstype, "ufs") != 0)
+#endif
+       || (strncmp(mnt.mnt_mntopts, "ro,ignore", 9) == 0))
            continue;
 
        /* If we're going to always attach this partition, do it later. */