From 1482f98247f00bcbd7e5593bec614df7748c5af6 Mon Sep 17 00:00:00 2001 From: Hiroki Sato Date: Fri, 10 Oct 2014 03:20:12 +0000 Subject: 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. Reported by: wblock (long time ago) MFC after: 1 day --- sbin/swapon/swapon.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'sbin/swapon') diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c index 5c6086d9bb97..033c40a8edac 100644 --- a/sbin/swapon/swapon.c +++ b/sbin/swapon/swapon.c @@ -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, -- cgit v1.2.3