aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-03-04 00:29:43 +0000
committerRoy Marples <roy@marples.name>2008-03-04 00:29:43 +0000
commit9f0d99020a9a4df9389ddb40979fad54598c3e28 (patch)
treed25e0acc5a118759bb3db1691fb8344bdbf8234b
parent9a1f3768a5a2453b71092cab169a6bf47b065f63 (diff)
swapctl -t doesn't work on fbsd.
-rw-r--r--init.d.BSD/Makefile2
-rw-r--r--init.d.NetBSD/Makefile2
-rw-r--r--init.d.NetBSD/swap-blk.in (renamed from init.d.BSD/swap-blk.in)0
-rw-r--r--init.d/swap.in18
4 files changed, 10 insertions, 12 deletions
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.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.BSD/swap-blk.in b/init.d.NetBSD/swap-blk.in
index 4708bfff..4708bfff 100644
--- a/init.d.BSD/swap-blk.in
+++ b/init.d.NetBSD/swap-blk.in
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
}