svn commit: r315242 - head/sbin/swapon

[Dmitry Marakasov]

Author: amdmi3 (ports committer)
Date: Tue Mar 14 12:39:19 2017
New Revision: 315242
URL: https://svnweb.freebsd.org/changeset/base/315242

Log:
  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
  MFC after:	2 weeks
  Differential Revision:	D9835

Modified:
  head/sbin/swapon/swapon.c

Modified: head/sbin/swapon/swapon.c
==============================================================================
--- head/sbin/swapon/swapon.c	Tue Mar 14 10:09:50 2017	(r315241)
+++ head/sbin/swapon/swapon.c	Tue Mar 14 12:39:19 2017	(r315242)
@@ -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);