remove swapfiles service

The swapfiles service was basically a copy of the swap service, so this
commit consolidates the functionality into the swap service.

X-Funtoo-Bug-URL: https://bugs.funtoo.org/browse/FL-2523
X-Gentoo-Bug: 568162
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=568162

7 files changed, 24 insertions, 52 deletions

diff --git a/NEWS.md b/NEWS.md
index 43310143..d50741ab 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -3,6 +3,13 @@
 This file will contain a list of notable changes for each release. Note
 the information in this file is in reverse order.
 
+## OpenRC-0.22
+
+The swapfiles service, which was basically a copy of the swap service,
+has been removed. If you are only using swap partitions, this change
+will not affect you. If you are using swap files, please adjust the
+dependencies of the swap service as shown in /etc/conf.d/swap.
+
 ## OpenRC-0.21
 
 This version adds a daemon supervisor which can start daemons and
diff --git a/conf.d/Makefile b/conf.d/Makefile
index a1cc7fb3..a18ca749 100644
--- a/conf.d/Makefile
+++ b/conf.d/Makefile
@@ -1,7 +1,7 @@
 include ../mk/net.mk
 
 DIR=	${CONFDIR}
-CONF=	bootmisc fsck hostname localmount netmount urandom tmpfiles \
+CONF=	bootmisc fsck hostname localmount netmount swap urandom tmpfiles \
 		${CONF-${OS}}
 
 ifeq (${MKNET},yes)
diff --git a/conf.d/swap b/conf.d/swap
new file mode 100644
index 00000000..17bd0341
--- /dev/null
+++ b/conf.d/swap
@@ -0,0 +1,13 @@
+# If you are only using local swap partitions, you should not change
+# this file. Otherwise, you need to uncomment the below rc_before line
+# followed by the appropriate rc_need line.
+#rc_before="!localmount"
+#
+# If you are using swap files stored on local file systems, uncomment
+# this line.
+#rc_need="localmount"
+#
+# If you are using swap files stored on network file systems or swap
+# partitions stored on network block devices such as iSCSI, uncomment
+# this line.
+#rc_need="netmount"
diff --git a/init.d/.gitignore b/init.d/.gitignore
index f856699a..98748c7b 100644
--- a/init.d/.gitignore
+++ b/init.d/.gitignore
@@ -12,7 +12,6 @@ network
 root
 savecache
 swap
-swapfiles
 sysctl
 urandom
 devfs
diff --git a/init.d/Makefile b/init.d/Makefile
index 8eb62e48..bec4eaf9 100644
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -2,9 +2,8 @@ include ../mk/net.mk
 
 DIR=	${INITDIR}
 SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in loopback.in \
-	netmount.in osclock.in root.in savecache.in swap.in swapfiles.in \
-	tmpfiles.setup.in swclock.in sysctl.in runsvdir.in urandom.in \
-	s6-svscan.in ${SRCS-${OS}}
+	netmount.in osclock.in root.in savecache.in swap.in tmpfiles.setup.in  \
+	swclock.in sysctl.in runsvdir.in urandom.in s6-svscan.in ${SRCS-${OS}}
 BIN=	${OBJS}
 
 # Are we installing our network scripts?
diff --git a/init.d/swapfiles.in b/init.d/swapfiles.in
deleted file mode 100644
index 92b5c899..00000000
--- a/init.d/swapfiles.in
+++ /dev/null
@@ -1,46 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-depend()
-{
-	need localmount
-	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
-}
-
-start()
-{
-	ebegin "Activating additional swap space"
-	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 additional swap space"
-	case "$RC_UNAME" in
-		Linux)
-			if [ -e /proc/swaps ]; then
-				while read filename type rest; do
-					case "$type" in
-						file) swapoff $filename >/dev/null;;
-					esac
-					case "$filename" in
-						/dev/loop*) swapoff $filename >/dev/null;;
-					esac
-				done < /proc/swaps
-			fi
-			;;
-	esac
-	eend 0
-}
diff --git a/runlevels/Makefile b/runlevels/Makefile
index d367147e..6abd8c52 100644
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -1,7 +1,7 @@
 include ../mk/net.mk
 
 BOOT=		bootmisc fsck hostname localmount loopback \
-		root swap swapfiles sysctl urandom ${BOOT-${OS}}
+		root swap sysctl urandom ${BOOT-${OS}}
 DEFAULT=	local netmount
 NONETWORK=	local
 SHUTDOWN=	savecache ${SHUTDOWN-${OS}}