With recent changes to swapctl(8), replace the invocation of swapon

with two swapctl invocations.
Swap on block devices is enabled before fscking filesystems, swap on
files is enabled after all filesystems (including remote) are mounted.

1 files changed, 4 insertions, 2 deletions

diff --git a/etc/rc b/etc/rc
index a34ed429f57..8c27d15c799 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.171 2001/05/30 02:11:09 deraadt Exp $
+#	$OpenBSD: rc,v 1.172 2001/06/02 03:06:29 miod Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -64,7 +64,7 @@ for dev in 0 1 2 3; do
 	fi
 done
 
-swapon -a
+swapctl -A -t blk
 
 if [ -e /fastboot ]; then
 	echo "Fast boot: skipping disk checks."
@@ -268,6 +268,8 @@ echo '.'
 
 mount -a -t nfs
 
+swapctl -A -t noblk
+
 # /var/crash should be a directory or a symbolic link
 # to the crash directory if core dumps are to be saved.
 if [ -d /var/crash ]; then