diff options
| author | flz <flz@FreeBSD.org> | 2006-02-12 12:57:07 +0000 |
|---|---|---|
| committer | flz <flz@FreeBSD.org> | 2006-02-12 12:57:07 +0000 |
| commit | ea926ddbd3773685cdd2763dfc8f46ad0e4b4cbc (patch) | |
| tree | 1f2a83347936a4b7698cca6004d8b9d887719cfc /etc | |
| parent | ba220d91eae944153ac9f99dc5a2cadb60934f8c (diff) | |
| download | FreeBSD-src-ea926ddbd3773685cdd2763dfc8f46ad0e4b4cbc.zip FreeBSD-src-ea926ddbd3773685cdd2763dfc8f46ad0e4b4cbc.tar.gz | |
Don't include geli devices in list when noauto is specified in the options field.
Approved by: pjd
MFC after: 3 days
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/rc.subr | 11 |
1 files changed, 10 insertions, 1 deletions
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}" |
