Date: Sat, 11 Oct 2014 20:35:37 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r272960 - stable/10/sbin/swapon Message-ID: <201410112035.s9BKZbC8074058@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410112035.s9BKZbC8074058>