From cc98ae391738f981d4b4e19a3b90579ed8717a12 Mon Sep 17 00:00:00 2001 From: Robert Banz Date: Tue, 20 Mar 2007 19:02:10 +0000 Subject: [PATCH] STABLE14-namei-allow-zfs-20070320 don't force AlwaysAttach on ZFS in namei (cherry picked from commit af0a976f1151f7ca7642013357d1dcc7267c6457) --- src/vol/partition.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/vol/partition.c b/src/vol/partition.c index f8aa3a81dd..30e61d739b 100644 --- a/src/vol/partition.c +++ b/src/vol/partition.c @@ -437,8 +437,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. */