From ea926ddbd3773685cdd2763dfc8f46ad0e4b4cbc Mon Sep 17 00:00:00 2001
From: flz <flz@FreeBSD.org>
Date: Sun, 12 Feb 2006 12:57:07 +0000
Subject: Don't include geli devices in list when noauto is specified in the
 options field.

Approved by:	pjd
MFC after:	3 days
---
 etc/rc.subr | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'etc')

diff --git a/etc/rc.subr b/etc/rc.subr
index 7c77cc8..78a0f36 100644
--- a/etc/rc.subr
+++ b/etc/rc.subr
@@ -1329,13 +1329,22 @@ geli_make_list()
 
 	# Create list of GELI providers from fstab.
 	while read provider mountpoint type options rest ; do
+		case ":${options}" in
+		:*noauto*)
+			noauto=yes
+			;;
+		*)
+			noauto=no
+			;;
+		esac
+
 		case ":${provider}" in
 		:#*)
 			continue
 			;;
 		*.eli)
 			# Skip swap devices.
-			if [ "${type}" = "swap" -o "${options}" = "sw" ]; then
+			if [ "${type}" = "swap" -o "${options}" = "sw" -o "${noauto}" = "yes" ]; then
 				continue
 			fi
 			devices="${devices} ${provider}"
-- 
cgit v1.1