Author: hrs
Date: Fri Oct 10 03:20:12 2014
New Revision: 272885
URL: https://svnweb.freebsd.org/changeset/base/272885
Log:
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
Modified:
head/sbin/swapon/swapon.c
Modified: head/sbin/swapon/swapon.c
==============================================================================
--- head/sbin/swapon/swapon.c Fri Oct 10 03:05:55 2014 (r272884)
+++ head/sbin/swapon/swapon.c Fri Oct 10 03:20:12 2014 (r272885)
@@ -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,
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
