MFC: Teach swap1 script how to remove added swap devices on system shutdown.
     Without this change, if one had a swap-on-mirror configuration, gmirror
     will rebuild mirror component(s) on boot, because they are dirty (they
     were open on shutdown).

Index: etc/rc.d/swap1
===================================================================
RCS file: /private/FreeBSD/src/etc/rc.d/swap1,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- etc/rc.d/swap1	8 Mar 2004 12:25:05 -0000	1.6
+++ etc/rc.d/swap1	17 Sep 2004 17:58:19 -0000	1.7
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: swap1,v 1.8 2002/03/24 15:52:41 lukem Exp $
-# $FreeBSD: src/etc/rc.d/swap1,v 1.6 2004/03/08 12:25:05 pjd Exp $
+# $FreeBSD: src/etc/rc.d/swap1,v 1.7 2004/09/17 17:58:19 pjd Exp $
 #
 
 # PROVIDE: localswap
@@ -12,27 +12,7 @@
 
 name="swap1"
 start_cmd='swapon -a'
-stop_cmd=':'
-
-#		Add all block-type swap devices; these might be necessary
-#		during disk checks.
-#
-swap1_start()
-{
-	if ! checkyesno no_swap; then
-		swapctl -A -t blk
-	fi
-}
-
-#		Remove all block-type swap devices
-#
-swap1_stop()
-{
-	if checkyesno swapoff || [ -n "$rc_force" ]; then
-		echo "Removing block-type swap devices"
-		swapctl -U -t blk
-	fi
-}
+stop_cmd='swapoff -a'
 
 load_rc_config swap
 run_rc_command "$1"