mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-23 11:18:54 +00:00
Code Issues Releases Activity

Do not add late flag when file= is specified because it has a bad

Browse Source 
side-effect.  The specified file should exist before the fstab line.

Reported by:	wblock (long time ago)
MFC after:	1 day
This commit is contained in:
Hiroki Sato 2014-10-10 03:20:12 +00:00
parent b888b86e6f
commit 1482f98247
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=272885
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sbin/swapon/swapon.c
View File

@ -172,15 +172,8 @@ main(int argc, char **argv)
continue;
if (strstr(fsp->fs_mntops, "noauto") != NULL)
continue;
/*
* Forcibly enable "late" option when file= is
* specified. This is because mounting file
* systems with rw option is typically
* required to make the backing store ready.
*/
if (which_prog != SWAPOFF &&
(strstr(fsp->fs_mntops, "late") != NULL ||
strstr(fsp->fs_mntops, "file=") != NULL) &&
strstr(fsp->fs_mntops, "late") &&
late == 0)
continue;
swfile = swap_on_off(fsp->fs_spec, 1,