rc-functions.sh: Remove addon support

This is an old relic from Gentoo baselayout-1.x which should not be used
any longer.
This commit is contained in:
William Hubbs 2018-07-09 18:02:54 -05:00
parent a571a42421
commit 2eea73bfd5
4 changed files with 8 additions and 38 deletions

View File

@ -4,6 +4,13 @@ OpenRC NEWS
This file will contain a list of notable changes for each release. Note This file will contain a list of notable changes for each release. Note
the information in this file is in reverse order. the information in this file is in reverse order.
## OpenRC 0.39
This version removes the support for addons.
The only place I know that this was used was Gentoo Baselayout 1.x, so
it shouldn't affect anyone since baselayout-1 has been dead for a few
years.
## OpenRC 0.37 ## OpenRC 0.37
start-stop-daemon now supports logging stdout and stderr of daemons to start-stop-daemon now supports logging stdout and stderr of daemons to

1
sh/.gitignore vendored
View File

@ -1,6 +1,5 @@
functions.sh functions.sh
gendepends.sh gendepends.sh
rc-functions.sh
openrc-run.sh openrc-run.sh
cgroup-release-agent.sh cgroup-release-agent.sh
init.sh init.sh

View File

@ -1,6 +1,6 @@
DIR= ${LIBEXECDIR}/sh DIR= ${LIBEXECDIR}/sh
SRCS= init.sh.in functions.sh.in gendepends.sh.in \ SRCS= init.sh.in functions.sh.in gendepends.sh.in \
openrc-run.sh.in rc-functions.sh.in ${SRCS-${OS}} openrc-run.sh.in ${SRCS-${OS}}
INC= rc-mount.sh functions.sh rc-functions.sh runit.sh s6.sh \ INC= rc-mount.sh functions.sh rc-functions.sh runit.sh s6.sh \
start-stop-daemon.sh supervise-daemon.sh start-stop-daemon.sh supervise-daemon.sh
BIN= gendepends.sh init.sh openrc-run.sh ${BIN-${OS}} BIN= gendepends.sh init.sh openrc-run.sh ${BIN-${OS}}

View File

@ -2,42 +2,6 @@
# Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
# Released under the 2-clause BSD license. # Released under the 2-clause BSD license.
has_addon()
{
[ -e /@LIB@/rc/addons/"$1".sh -o -e /@LIB@/rcscripts/addons/"$1".sh ]
}
_addon_warn()
{
eindent
ewarn "$RC_SVCNAME uses addon code which is deprecated"
ewarn "and may not be available in the future."
eoutdent
}
import_addon()
{
if [ -e /@LIB@/rc/addons/"$1".sh ]; then
_addon_warn
. /@LIB@/rc/addons/"$1".sh
elif [ -e /@LIB@/rcscripts/addons/"$1".sh ]; then
_addon_warn
. /@LIB@/rcscripts/addons/"$1".sh
else
return 1
fi
}
start_addon()
{
( import_addon "$1-start" )
}
stop_addon()
{
( import_addon "$1-stop" )
}
net_fs_list="afs ceph cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre net_fs_list="afs ceph cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre
ncpfs nfs nfs4 ocfs2 shfs smbfs" ncpfs nfs nfs4 ocfs2 shfs smbfs"
is_net_fs() is_net_fs()