--- /etc/rc.subr	Sat Feb 11 21:02:38 2006
+++ /etc/rc.subr.new	Sat Feb 11 21:01:25 2006
@@ -1328,13 +1328,22 @@
 
 	# 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}"