Remove vestiges of MFS.

9 files changed, 6 insertions, 15 deletions

diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf
index 706a29c..8780ba5 100644
--- a/etc/defaults/periodic.conf
+++ b/etc/defaults/periodic.conf
@@ -114,7 +114,6 @@ daily_status_security_enable="YES"			# Security check
 daily_status_security_inline="NO"			# Run inline ?
 daily_status_security_output="root"			# user or /file
 daily_status_security_noamd="NO"			# Don't check amd mounts
-daily_status_security_nomfs="NO"			# Don't check mfs mounts
 
 # 460.status-mail-rejects
 daily_status_mail_rejects_enable="YES"			# Check mail rejects
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 69ead05..1756796 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -106,8 +106,6 @@
     ufs
         ffs
         ..
-        mfs
-        ..
         ufs
         ..
     ..
diff --git a/etc/periodic/daily/450.status-security b/etc/periodic/daily/450.status-security
index 4953fbb..d18723f 100755
--- a/etc/periodic/daily/450.status-security
+++ b/etc/periodic/daily/450.status-security
@@ -23,11 +23,6 @@ case "$daily_status_security_enable" in
 		args=;;
 	esac
 
-	case "$daily_status_security_nomfs" in
-	    [Yy][Ee][Ss])
-		args="$args -m";;
-	esac
-
 	case "$daily_status_security_inline" in
 	    [Yy][Ee][Ss])
 		sh /etc/security -s $args
diff --git a/etc/rc.d/diskless b/etc/rc.d/diskless
index f297e24..740c23c 100644
--- a/etc/rc.d/diskless
+++ b/etc/rc.d/diskless
@@ -55,7 +55,7 @@ mount_md()
 	/sbin/mount /dev/md$3c $2
 }
 
-echo "+++ mfs_mount of /var"
+# If there is a global system configuration file, suck it in.
 mount_md ${varsize:=65536} /var 1
 if [ -r /etc/rc.subr ]; then
         . /etc/rc.subr
diff --git a/etc/rc.d/resolv b/etc/rc.d/resolv
index f297e24..740c23c 100644
--- a/etc/rc.d/resolv
+++ b/etc/rc.d/resolv
@@ -55,7 +55,7 @@ mount_md()
 	/sbin/mount /dev/md$3c $2
 }
 
-echo "+++ mfs_mount of /var"
+# If there is a global system configuration file, suck it in.
 mount_md ${varsize:=65536} /var 1
 if [ -r /etc/rc.subr ]; then
         . /etc/rc.subr
diff --git a/etc/rc.d/tmp b/etc/rc.d/tmp
index f297e24..740c23c 100644
--- a/etc/rc.d/tmp
+++ b/etc/rc.d/tmp
@@ -55,7 +55,7 @@ mount_md()
 	/sbin/mount /dev/md$3c $2
 }
 
-echo "+++ mfs_mount of /var"
+# If there is a global system configuration file, suck it in.
 mount_md ${varsize:=65536} /var 1
 if [ -r /etc/rc.subr ]; then
         . /etc/rc.subr
diff --git a/etc/rc.d/var b/etc/rc.d/var
index f297e24..740c23c 100644
--- a/etc/rc.d/var
+++ b/etc/rc.d/var
@@ -55,7 +55,7 @@ mount_md()
 	/sbin/mount /dev/md$3c $2
 }
 
-echo "+++ mfs_mount of /var"
+# If there is a global system configuration file, suck it in.
 mount_md ${varsize:=65536} /var 1
 if [ -r /etc/rc.subr ]; then
         . /etc/rc.subr
diff --git a/etc/rc.diskless2 b/etc/rc.diskless2
index a3f58fe..fe329a6 100644
--- a/etc/rc.diskless2
+++ b/etc/rc.diskless2
@@ -55,7 +55,7 @@ elif [ -r /etc/rc.conf ]; then
 	. /etc/rc.conf
 fi
 
-echo "+++ mfs_mount of /var"
+echo "+++ mount_md of /var"
 mount_md ${varsize:=65536} /var 1
 
 echo "+++ populate /var using /etc/mtree/BSD.var.dist"
diff --git a/etc/security b/etc/security
index f2b1d94..eaf2cb7 100644
--- a/etc/security
+++ b/etc/security
@@ -47,11 +47,10 @@ catmsgs() {
 }
 
 sflag=FALSE ignore=
-while getopts ams c
+while getopts as c
 do
 	case "$c" in
 		a) ignore="$ignore|^amd:";;
-		m) ignore="$ignore|^mfs:";;
 		s) sflag=TRUE;;
 	esac
 done