Attachment 161855 Details for Bug 187081 – fix "swaplate" to deal only with "late" swap devices

[patch] fix "swaplate" to deal only with "late" swap devices

swapfix.diff (text/plain), 1.47 KB, created by c.kworr on 2015-10-09 15:17:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: c.kworr

Created: 2015-10-09 15:17:24 UTC

Size: 1.47 KB

patch

obsolete

>Index: etc/rc.d/swaplate
>===================================================================
>--- etc/rc.d/swaplate	(revision 289065)
>+++ etc/rc.d/swaplate	(working copy)
>@@ -11,7 +11,7 @@
> 
> name="swaplate"
> start_cmd='/sbin/swapon -aLq'
>-stop_cmd='/sbin/swapoff -aq'
>+stop_cmd='/sbin/swapoff -aLq'
> 
> load_rc_config swap
> run_rc_command "$1"
>Index: sbin/swapon/swapon.8
>===================================================================
>--- sbin/swapon/swapon.8	(revision 289065)
>+++ sbin/swapon/swapon.8	(working copy)
>@@ -78,9 +78,9 @@
> If the
> .Fl L
> option is specified,
>-swap devices with the
>+only swap devices with the
> .Dq late
>-option will be added as well as ones with no option.
>+option will be added.
> If the
> .Fl q
> option is used,
>@@ -102,9 +102,9 @@
> If the
> .Fl L
> option is specified,
>-swap devices with the
>+only swap devices with the
> .Dq late
>-option will be removed as well as ones with no option.
>+option will be removed.
> If the
> .Fl q
> option is used,
>Index: sbin/swapon/swapon.c
>===================================================================
>--- sbin/swapon/swapon.c	(revision 289065)
>+++ sbin/swapon/swapon.c	(working copy)
>@@ -172,9 +172,8 @@
> 					continue;
> 				if (strstr(fsp->fs_mntops, "noauto") != NULL)
> 					continue;
>-				if (which_prog != SWAPOFF &&
>-				    strstr(fsp->fs_mntops, "late") &&
>-				    late == 0)
>+				if (!strstr(fsp->fs_mntops, "late") ==
>+				    (late == 1))
> 					continue;
> 				swfile = swap_on_off(fsp->fs_spec, 1,
> 				    fsp->fs_mntops);

Actions: View | Diff

Attachments on bug 187081: 161855