From 015080b6cd8640661dc7e3a57b8a2462034d1fe3 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Sun, 14 Dec 2003 19:13:15 +0000
Subject: [PATCH] Make savecore return RC_CONFIGURED unconditionally.

Make the swap code return RC_CONFIGURED and also add a sysctl check
to determine if the kernel supports swapping.

Submitted-by: Peter Kadau <peter.kadau@tuebingen.mpg.de>
---
 etc/rc.d/savecore |  3 ++-
 etc/rc.d/swap1    | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/etc/rc.d/savecore b/etc/rc.d/savecore
index 750b85c3e9..0a34bc68e5 100644
--- a/etc/rc.d/savecore
+++ b/etc/rc.d/savecore
@@ -2,7 +2,7 @@
 #
 # $NetBSD: savecore,v 1.5 2002/03/22 04:34:00 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/savecore,v 1.3 2002/09/06 16:18:05 gordon Exp $
-# $DragonFly: src/etc/rc.d/savecore,v 1.3 2003/12/11 23:28:41 dillon Exp $
+# $DragonFly: src/etc/rc.d/savecore,v 1.4 2003/12/14 19:13:15 dillon Exp $
 #
 
 # PROVIDE: savecore
@@ -97,6 +97,7 @@ savecore_start()
 	if [ X$dumpdev != X ]; then
 		echo "Checking for core dump..."
 		savecore ${savecore_flags} ${DUMPDIR}
+		return ${RC_CONFIGURED}
 	fi
 }
 
diff --git a/etc/rc.d/swap1 b/etc/rc.d/swap1
index 047a87a92d..8243040046 100644
--- a/etc/rc.d/swap1
+++ b/etc/rc.d/swap1
@@ -2,7 +2,7 @@
 #
 # $NetBSD: swap1,v 1.8 2002/03/24 15:52:41 lukem Exp $
 # $FreeBSD: src/etc/rc.d/swap1,v 1.3 2002/09/06 16:18:05 gordon Exp $
-# $DragonFly: src/etc/rc.d/swap1,v 1.2 2003/11/19 10:32:45 eirikn Exp $
+# $DragonFly: src/etc/rc.d/swap1,v 1.3 2003/12/14 19:13:15 dillon Exp $
 #
 
 # PROVIDE: localswap
@@ -15,7 +15,7 @@ name="swap1"
 
 case ${OSTYPE} in
 DragonFly)
-	start_cmd='swapon -a'
+	start_cmd='df_swap1_start'
 	stop_cmd=':'
 	;;
 FreeBSD)
@@ -51,5 +51,16 @@ swap1_stop()
 	fi
 }
 
+df_swap1_start()
+{
+	if [ `${SYSCTL_N} vm.swap_enabled` = 0 ]; then
+		return ${RC_CONFIGURED}
+	else
+		swapon -a && return ${RC_CONFIGURED}
+	fi
+	return ${RC_FAILED}
+}
+
+
 load_rc_config swap
 run_rc_command "$1"
-- 
2.35.2