aboutsummaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2007-06-23 12:16:44 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2007-06-23 12:16:44 +0000
commit632a10fd2421a42da53bae00cf60e1e4c1b32eef (patch)
tree3d932579ae0cf0d5df302c99f9df42fd17a69e3d /usr
parentReleased version 0.3.10 (diff)
downloadgentoo-vdr-scripts-632a10fd2421a42da53bae00cf60e1e4c1b32eef.tar.gz
gentoo-vdr-scripts-632a10fd2421a42da53bae00cf60e1e4c1b32eef.tar.bz2
gentoo-vdr-scripts-632a10fd2421a42da53bae00cf60e1e4c1b32eef.zip
Only store loaded plugins for usage at stopping.
svn path=/gentoo-vdr-scripts/trunk/; revision=478
Diffstat (limited to 'usr')
-rw-r--r--usr/share/vdr/inc/plugin-functions.sh12
-rw-r--r--usr/share/vdr/rcscript/pre-start-95-plugins.sh2
2 files changed, 10 insertions, 4 deletions
diff --git a/usr/share/vdr/inc/plugin-functions.sh b/usr/share/vdr/inc/plugin-functions.sh
index 0422f8b..3d82043 100644
--- a/usr/share/vdr/inc/plugin-functions.sh
+++ b/usr/share/vdr/inc/plugin-functions.sh
@@ -50,7 +50,7 @@ init_plugin_loader() {
PLUGINS=""
# Load list of plugins which were started to exec correct rcaddons
- local LOADED_PLUGINS_FILE=/var/vdr/tmp/loaded_plugins
+ LOADED_PLUGINS_FILE=/var/vdr/tmp/loaded_plugins
if [ "${INIT_PHASE}" = "stop" ] && [ -e "${LOADED_PLUGINS_FILE}" ]; then
PLUGINS=$(cat ${LOADED_PLUGINS_FILE} )
else
@@ -69,9 +69,6 @@ init_plugin_loader() {
done
exec 3<&-
fi
-
- # Store list of loaded plugins
- echo ${PLUGINS} > ${LOADED_PLUGINS_FILE}
fi
skipped_plugins_patchlevel=""
skipped_plugins_not_found=""
@@ -178,5 +175,12 @@ add_plugin_params_to_vdr_call() {
fi
}
+store_loaded_plugin() {
+ if [ "${SKIP_PLUGIN}" = "0" ]; then
+ # Store list of loaded plugins
+ echo "$1" >> "${LOADED_PLUGINS_FILE}"
+ fi
+}
+
init_plugin_loader
diff --git a/usr/share/vdr/rcscript/pre-start-95-plugins.sh b/usr/share/vdr/rcscript/pre-start-95-plugins.sh
index 5ca3ea3..a1a65fa 100644
--- a/usr/share/vdr/rcscript/pre-start-95-plugins.sh
+++ b/usr/share/vdr/rcscript/pre-start-95-plugins.sh
@@ -19,6 +19,8 @@ addon_main() {
# add to commandline
add_plugin_params_to_vdr_call
+ store_loaded_plugin ${PLUGIN}
+
# count the skipped ones
if [ "${SKIP_PLUGIN}" = "1" ]; then
SKIP_COUNT=$(($SKIP_COUNT+1))