Remove what I believe are two useless ifdefs. If a user or administrator
enables multilabel, or any option for that matter, most likely they have a reason. This will allow users to see that mulilabel is enabled via an issued "mount" command and remove an annoying warning - printed only when a MAC kernel is not installed - on boot up. Discussed with: green, brueffer, Samy Al Bahra. Probably ran past: csjp (though I can't remember).
This commit is contained in:
parent
9ac58632a3
commit
8fc22c9d2e
@ -760,21 +760,9 @@ ffs_mountfs(devvp, mp, td)
|
||||
mp->mnt_maxsymlinklen = fs->fs_maxsymlinklen;
|
||||
mp->mnt_flag |= MNT_LOCAL;
|
||||
if ((fs->fs_flags & FS_MULTILABEL) != 0)
|
||||
#ifdef MAC
|
||||
mp->mnt_flag |= MNT_MULTILABEL;
|
||||
#else
|
||||
printf(
|
||||
"WARNING: %s: multilabel flag on fs but no MAC support\n",
|
||||
fs->fs_fsmnt);
|
||||
#endif
|
||||
if ((fs->fs_flags & FS_ACLS) != 0)
|
||||
#ifdef UFS_ACL
|
||||
mp->mnt_flag |= MNT_ACLS;
|
||||
#else
|
||||
printf(
|
||||
"WARNING: %s: ACLs flag on fs but no ACLs support\n",
|
||||
fs->fs_fsmnt);
|
||||
#endif
|
||||
ump->um_mountp = mp;
|
||||
ump->um_dev = dev;
|
||||
ump->um_devvp = devvp;
|
||||
|
Loading…
Reference in New Issue
Block a user