namei-allow-zfs-20070320

don't force AlwaysAttach on ZFS in namei
This commit is contained in:
Robert Banz 2007-03-20 18:59:22 +00:00 committed by Derrick Brashear
parent 29951ff73c
commit af0a976f11

View File

@ -460,8 +460,15 @@ VAttachPartitions(void)
} }
while (!getmntent(mntfile, &mnt)) { while (!getmntent(mntfile, &mnt)) {
/* Ignore non ufs or non read/write partitions */ /* Ignore non ufs or non read/write partitions */
if ((strcmp(mnt.mnt_fstype, "ufs") != 0) /* but allow zfs too if we're in the NAMEI environment */
|| (strncmp(mnt.mnt_mntopts, "ro,ignore", 9) == 0)) 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; continue;
/* If we're going to always attach this partition, do it later. */ /* If we're going to always attach this partition, do it later. */