From 9f0d99020a9a4df9389ddb40979fad54598c3e28 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Tue, 4 Mar 2008 00:29:43 +0000
Subject: swapctl -t doesn't work on fbsd.

---
 init.d.BSD/Makefile       |  2 +-
 init.d.BSD/swap-blk.in    | 23 -----------------------
 init.d.NetBSD/Makefile    |  2 +-
 init.d.NetBSD/swap-blk.in | 23 +++++++++++++++++++++++
 init.d/swap.in            | 18 ++++++++----------
 5 files changed, 33 insertions(+), 35 deletions(-)
 delete mode 100644 init.d.BSD/swap-blk.in
 create mode 100644 init.d.NetBSD/swap-blk.in

diff --git a/init.d.BSD/Makefile b/init.d.BSD/Makefile
index 6d555813..b83e4216 100644
--- a/init.d.BSD/Makefile
+++ b/init.d.BSD/Makefile
@@ -1,6 +1,6 @@
 DIR=	/etc/init.d
 SRCS=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
-	rpcbind.in savecore.in swap-blk.in sysctl.in syslogd.in
+	rpcbind.in savecore.in sysctl.in syslogd.in
 BIN=	${OBJS}
 
 MK=	../mk
diff --git a/init.d.BSD/swap-blk.in b/init.d.BSD/swap-blk.in
deleted file mode 100644
index 4708bfff..00000000
--- a/init.d.BSD/swap-blk.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#!@PREFIX@/sbin/runscript
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
-
-depend()
-{
-	before fsck
-	keyword nojail noprefix
-}
-
-start()
-{
-	ebegin "Activating block swap devices"
-	swapctl -A -t blk >/dev/null
-	eend 0 # If swapon has nothing todo it errors, so always return 0
-}	
-
-stop()
-{
-	ebegin "Deactivating block swap devices"
-	swapctl -U -t blk >/dev/null
-	eend 0 
-}
diff --git a/init.d.NetBSD/Makefile b/init.d.NetBSD/Makefile
index 4ffdf503..12ec1548 100644
--- a/init.d.NetBSD/Makefile
+++ b/init.d.NetBSD/Makefile
@@ -1,5 +1,5 @@
 DIR=	/etc/init.d
-SRCS=	ttys.in wscons.in
+SRCS=	swap-blk.in ttys.in wscons.in
 BIN=	${OBJS}
 
 MK=	../mk
diff --git a/init.d.NetBSD/swap-blk.in b/init.d.NetBSD/swap-blk.in
new file mode 100644
index 00000000..4708bfff
--- /dev/null
+++ b/init.d.NetBSD/swap-blk.in
@@ -0,0 +1,23 @@
+#!@PREFIX@/sbin/runscript
+# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
+
+depend()
+{
+	before fsck
+	keyword nojail noprefix
+}
+
+start()
+{
+	ebegin "Activating block swap devices"
+	swapctl -A -t blk >/dev/null
+	eend 0 # If swapon has nothing todo it errors, so always return 0
+}	
+
+stop()
+{
+	ebegin "Deactivating block swap devices"
+	swapctl -U -t blk >/dev/null
+	eend 0 
+}
diff --git a/init.d/swap.in b/init.d/swap.in
index 4e027982..6b2f7057 100644
--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -11,21 +11,19 @@ depend()
 start()
 {
 	ebegin "Activating swap devices"
-	if type swapctl >/dev/null 2>&1; then
-		swapctl -A -t noblk >/dev/null
-	else
-		swapon -a >/dev/null
-	fi
+	case "${RC_UNAME}" in
+		NetBSD|OpenBSD) swapctl -A -t noblk >/dev/null;;
+		*)		swapon -a >/dev/null;;
+	esac
 	eend 0 # If swapon has nothing todo it errors, so always return 0
 }	
 
 stop()
 {
 	ebegin "Deactivating swap devices"
-	if type swapctl >/dev/null 2>&1; then
-		swapctl -U -t noblk >/dev/null
-	else
-		swapoff -a >/dev/null
-	fi
+	case "${RC_UNAME}" in
+		NetBSD|OpenBSD)	swapctl -U -t noblk >/dev/null;;
+		*)		swapoff -a >/dev/null;;
+	esac
 	eend 0 
 }
-- 
cgit v1.2.3