diff options
| author | William Hubbs <w.d.hubbs@gmail.com> | 2016-09-03 14:04:03 -0500 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2016-09-05 13:39:51 -0500 |
| commit | d06db93d5954460668d09cf6ef2fc401ee9d981c (patch) | |
| tree | 4c400e1dd14d763457507eb73b24d730ad1ccec8 /init.d | |
| parent | 8c14d0c476e06fff7598c526e26b6a13d53a4600 (diff) | |
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
Diffstat (limited to 'init.d')
| -rw-r--r-- | init.d/.gitignore | 1 | ||||
| -rw-r--r-- | init.d/Makefile | 5 | ||||
| -rw-r--r-- | init.d/swapfiles.in | 46 |
3 files changed, 2 insertions, 50 deletions
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 -} |