Don't include geli devices in list when noauto is specified in the options field.

Approved by:	pjd
MFC after:	3 days
This commit is contained in:
Florent Thoumie 2006-02-12 12:57:07 +00:00
parent 34733eb529
commit 54a6effc95

View File

@ -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}"