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

Enable "late" option when a file= option is specified in /etc/fstab.

Browse Source 
The file= option requires rw mount where the backing store exists but
it does not work because rc.d/swap runs before rc.d/fsck.
Reported by:	wblock
This commit is contained in:
Hiroki Sato 2013-09-05 20:50:52 +00:00
parent 79e6a2c01e
commit 4139627db6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=255265
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sbin/swapon/swapon.c
View File

@ -170,13 +170,20 @@ main(int argc, char **argv)
if (which_prog == SWAPON || which_prog == SWAPOFF) {
if (doall) {
while ((fsp = getfsent()) != NULL) {
if (strcmp(fsp->fs_type, FSTAB_SW))
if (strcmp(fsp->fs_type, FSTAB_SW) != 0)
continue;
if (strstr(fsp->fs_mntops, "noauto"))
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") &&
!late)
(strstr(fsp->fs_mntops, "late") != NULL ||
strstr(fsp->fs_mntops, "file=") != NULL) &&
late == 0)
continue;
swfile = swap_on_off(fsp->fs_spec, 1,
fsp->fs_mntops);