Date: Tue, 28 Mar 2017 10:43:19 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r316096 - stable/11/sbin/swapon Message-ID: <201703281043.v2SAhJKx027316@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 (ports committer) Date: Tue Mar 28 10:43:19 2017 New Revision: 316096 URL: https://svnweb.freebsd.org/changeset/base/316096 Log: 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 Modified: stable/11/sbin/swapon/swapon.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sbin/swapon/swapon.c ============================================================================== --- stable/11/sbin/swapon/swapon.c Tue Mar 28 10:39:17 2017 (r316095) +++ stable/11/sbin/swapon/swapon.c Tue Mar 28 10:43:19 2017 (r316096) @@ -375,8 +375,12 @@ swap_on_geli_args(const char *mntops) free(ops); return (NULL); } - } else if ((p = strstr(token, "notrim")) == token) { + } else if (strcmp(token, "notrim") == 0) { Tflag = " -T "; + } 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703281043.v2SAhJKx027316>