From 38ebb24d5d8fc72a569c0a6dcf652321a10ed3ea Mon Sep 17 00:00:00 2001 From: amdmi3 Date: Tue, 28 Mar 2017 10:43:20 +0000 Subject: [PATCH] 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c index 436ccd60e..22e04cf68 100644 --- a/sbin/swapon/swapon.c +++ b/sbin/swapon/swapon.c @@ -369,6 +369,10 @@ swap_on_geli_args(const char *mntops) free(ops); return (NULL); } + } else if (strcmp(token, "late") == 0) { + /* ignore known option */ + } else if (strcmp(token, "noauto") == 0) { + /* ignore known option */ } else if (strcmp(token, "sw") != 0) { warnx("Invalid option: %s", token); free(ops); -- 2.45.0