swapctl -t doesn't work on fbsd.
This commit is contained in:
		| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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  | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user