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

MFC r272885:

Browse Source 
Do not add late flag when file= is specified because it has a bad
  side-effect.  The specified file should exist before the fstab line.
This commit is contained in:
hrs 2014-10-11 20:35:36 +00:00
parent b9241c62af
commit 72b3bc6083
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; continue;
if (strstr(fsp->fs_mntops, "noauto") != NULL) if (strstr(fsp->fs_mntops, "noauto") != NULL)
continue; 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 && if (which_prog != SWAPOFF &&
(strstr(fsp->fs_mntops, "late") != NULL || strstr(fsp->fs_mntops, "late") &&
strstr(fsp->fs_mntops, "file=") != NULL) &&
late == 0) late == 0)
continue; continue;
swfile = swap_on_off(fsp->fs_spec, 1, swfile = swap_on_off(fsp->fs_spec, 1,