d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix late and noauto with geli swap

Browse Source 
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
This commit is contained in:
Dmitry Marakasov 2017-03-14 12:39:19 +00:00
parent 01feb4c3d4
commit 8d27c2000b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/swapon/swapon.c
View File

@ -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);