From 0cca768b82a3225f82747863e674cae68ab790e1 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Wed, 12 Nov 2008 19:19:56 +0000
Subject: Mark the addon code as deprecated.

---
 sh/rc-functions.sh.in | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'sh')

diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in
index 751d47a3..8408814b 100644
--- a/sh/rc-functions.sh.in
+++ b/sh/rc-functions.sh.in
@@ -7,12 +7,22 @@ has_addon()
 	[ -e "${RC_LIBDIR}/addons/$1.sh" ] || [ -e /@LIB@/rcscripts/addons/"$1".sh ]
 }
 
+_addon_warn()
+{
+	eindent
+	ewarn "${RC_SVCNAME} uses addon code which is now deprecated in OpenRC"
+	ewarn "and is not guaranteed to be present in future versions."
+	eoutdent
+}
+
 import_addon()
 {
 	if [ -e "${RC_LIBDIR}/addons/$1.sh" ]; then
+		_addon_warn
 		. "${RC_LIBDIR}/addons/$1.sh"
-	elif [ -e /@LIB@/rcscripts/addons/"$1".sh ]; then
-		. /@LIB@/rcscripts/addons/"$1".sh
+	elif [ -e /lib64/rcscripts/addons/"$1".sh ]; then
+		_addon_warn
+		. /lib64/rcscripts/addons/"$1".sh
 	else
 		return 1
 	fi
-- 
cgit v1.2.3