diff options
| -rw-r--r-- | NEWS.md | 7 | ||||
| -rw-r--r-- | sh/.gitignore | 1 | ||||
| -rw-r--r-- | sh/Makefile | 2 | ||||
| -rw-r--r-- | sh/rc-functions.sh (renamed from sh/rc-functions.sh.in) | 36 |
4 files changed, 8 insertions, 38 deletions
@@ -4,6 +4,13 @@ OpenRC NEWS This file will contain a list of notable changes for each release. Note 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 start-stop-daemon now supports logging stdout and stderr of daemons to diff --git a/sh/.gitignore b/sh/.gitignore index 8a007103..186a409c 100644 --- a/sh/.gitignore +++ b/sh/.gitignore @@ -1,6 +1,5 @@ functions.sh gendepends.sh -rc-functions.sh openrc-run.sh cgroup-release-agent.sh init.sh diff --git a/sh/Makefile b/sh/Makefile index 4d7148fb..e5029bcd 100644 --- a/sh/Makefile +++ b/sh/Makefile @@ -1,6 +1,6 @@ DIR= ${LIBEXECDIR}/sh 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 \ start-stop-daemon.sh supervise-daemon.sh BIN= gendepends.sh init.sh openrc-run.sh ${BIN-${OS}} diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh index d6336a18..d77c5dd3 100644 --- a/sh/rc-functions.sh.in +++ b/sh/rc-functions.sh @@ -2,42 +2,6 @@ # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # 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 ncpfs nfs nfs4 ocfs2 shfs smbfs" is_net_fs() |