===================================================================
RCS file: /usr/local/www/cvsroot/FreeBSD/src/etc/rc.subr,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- src/etc/rc.subr	2005/12/10 20:19:08	1.47
+++ src/etc/rc.subr	2006/02/12 12:57:07	1.48
@@ -1,5 +1,5 @@
 # $NetBSD: rc.subr,v 1.60 2003/07/26 05:13:47 lukem Exp $
-# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/etc/rc.subr,v 1.47 2005/12/10 20:19:08 dougb Exp $
+# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/etc/rc.subr,v 1.48 2006/02/12 12:57:07 flz Exp $
 #
 # Copyright (c) 1997-2002 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -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}"