]> CyberLeo.Net >> Repos - FreeBSD/stable/10.git/commit
MFC r315242: Fix late and noauto with geli swap
authoramdmi3 <amdmi3@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Tue, 28 Mar 2017 10:43:20 +0000 (10:43 +0000)
committeramdmi3 <amdmi3@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Tue, 28 Mar 2017 10:43:20 +0000 (10:43 +0000)
commit38ebb24d5d8fc72a569c0a6dcf652321a10ed3ea
tree18ac9b43f2e74c4597cb2ba7dba19991ac61c1fb
parentb621cdb618f8607b65b48f7a3efc7da83bc74158
MFC r315242: Fix late and noauto with geli swap

With the following in /etc/fstab:

/dev/gpt/swap.eli none swap sw,late 0 0

swap will not be enabled, with `swapon -aL' complaining:

swapon: Invalid option: late

This happens because swap_on_geli_args() which parses geli arguments
out of all mount options does not expect late or noauto among them.
Fix this by explicitly allowing these arguments.

Reviewed by: jilles
Approved by: jilles
Differential Revision: D9835

git-svn-id: svn://svn.freebsd.org/base/stable/10@316097 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
sbin/swapon/swapon.c