svn commit: r272960 - stable/10/sbin/swapon

[Hiroki Sato]

Author: hrs
Date: Sat Oct 11 20:35:36 2014
New Revision: 272960
URL: https://svnweb.freebsd.org/changeset/base/272960

Log:
  MFC r272885:
    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.

Modified:
  stable/10/sbin/swapon/swapon.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/swapon/swapon.c
==============================================================================
--- stable/10/sbin/swapon/swapon.c	Sat Oct 11 20:28:04 2014	(r272959)
+++ stable/10/sbin/swapon/swapon.c	Sat Oct 11 20:35:36 2014	(r272960)
@@ -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,