| 1 |
Author: zzam |
| 2 |
Date: 2008-03-31 19:23:06 +0000 (Mon, 31 Mar 2008) |
| 3 |
New Revision: 585 |
| 4 |
|
| 5 |
Modified: |
| 6 |
gentoo-vdr-scripts/trunk/ChangeLog |
| 7 |
gentoo-vdr-scripts/trunk/usr/share/vdr/inc/plugin-functions.sh |
| 8 |
gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/post-start-05-plugins.sh |
| 9 |
gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/post-stop-05-plugins.sh |
| 10 |
gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/pre-start-95-plugins.sh |
| 11 |
gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/pre-stop-95-plugins.sh |
| 12 |
Log: |
| 13 |
Add better error handling, like for disk full condition. |
| 14 |
|
| 15 |
Modified: gentoo-vdr-scripts/trunk/ChangeLog |
| 16 |
=================================================================== |
| 17 |
--- gentoo-vdr-scripts/trunk/ChangeLog 2008-03-31 13:02:48 UTC (rev 584) |
| 18 |
+++ gentoo-vdr-scripts/trunk/ChangeLog 2008-03-31 19:23:06 UTC (rev 585) |
| 19 |
@@ -1,6 +1,14 @@ |
| 20 |
# ChangeLog for gentoo-vdr-scripts |
| 21 |
# $Id$ |
| 22 |
|
| 23 |
+ 31 Mar 2008; Matthias Schwarzott <zzam@g.o> |
| 24 |
+ usr/share/vdr/rcscript/post-stop-05-plugins.sh, |
| 25 |
+ usr/share/vdr/rcscript/post-start-05-plugins.sh, |
| 26 |
+ usr/share/vdr/rcscript/pre-stop-95-plugins.sh, |
| 27 |
+ usr/share/vdr/rcscript/pre-start-95-plugins.sh, |
| 28 |
+ usr/share/vdr/inc/plugin-functions.sh: |
| 29 |
+ Add better error handling, like for disk full condition. |
| 30 |
+ |
| 31 |
31 Mar 2008; Matthias Schwarzott <zzam@g.o> etc/init.d/vdr: |
| 32 |
Let init-script not silently fail at stop. |
| 33 |
|
| 34 |
|
| 35 |
Modified: gentoo-vdr-scripts/trunk/usr/share/vdr/inc/plugin-functions.sh |
| 36 |
=================================================================== |
| 37 |
--- gentoo-vdr-scripts/trunk/usr/share/vdr/inc/plugin-functions.sh 2008-03-31 13:02:48 UTC (rev 584) |
| 38 |
+++ gentoo-vdr-scripts/trunk/usr/share/vdr/inc/plugin-functions.sh 2008-03-31 19:23:06 UTC (rev 585) |
| 39 |
@@ -119,6 +119,7 @@ |
| 40 |
# skip_plugin "${PLUGIN}" "unresolved deps - please use revdep-rebuild" |
| 41 |
# return |
| 42 |
#fi |
| 43 |
+ return 0 |
| 44 |
} |
| 45 |
|
| 46 |
load_plugin() |
| 47 |
@@ -129,7 +130,7 @@ |
| 48 |
|
| 49 |
# Only check when starting vdr |
| 50 |
if [ "${INIT_PHASE}" != "stop" ]; then |
| 51 |
- check_plugin ${PLUGIN} |
| 52 |
+ check_plugin ${PLUGIN} || return 1 |
| 53 |
fi |
| 54 |
[ "${SKIP_PLUGIN}" = "1" ] && return |
| 55 |
|
| 56 |
@@ -162,8 +163,8 @@ |
| 57 |
if [ -n "${1}" ] && [ "${addon_prefix}" = "pre-start" ]; then |
| 58 |
|
| 59 |
local skip_tmp_file="/var/vdr/tmp/plugins_skipped" |
| 60 |
- echo "${PLUGIN}" >> "${skip_tmp_file}_ALL" |
| 61 |
- echo "${PLUGIN}" >> "${skip_tmp_file}_${ERROR}" |
| 62 |
+ echo "${PLUGIN}" >> "${skip_tmp_file}_ALL" || return 1 |
| 63 |
+ echo "${PLUGIN}" >> "${skip_tmp_file}_${ERROR}" || return 1 |
| 64 |
|
| 65 |
case "${ERROR}" in |
| 66 |
PATCHLEVEL) |
| 67 |
@@ -174,6 +175,7 @@ |
| 68 |
;; |
| 69 |
esac |
| 70 |
fi |
| 71 |
+ return 0 |
| 72 |
} |
| 73 |
|
| 74 |
add_plugin_params_to_vdr_call() { |
| 75 |
|
| 76 |
Modified: gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/post-start-05-plugins.sh |
| 77 |
=================================================================== |
| 78 |
--- gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/post-start-05-plugins.sh 2008-03-31 13:02:48 UTC (rev 584) |
| 79 |
+++ gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/post-start-05-plugins.sh 2008-03-31 19:23:06 UTC (rev 585) |
| 80 |
@@ -4,7 +4,7 @@ |
| 81 |
|
| 82 |
addon_main() { |
| 83 |
for PLUGIN in ${PLUGINS}; do |
| 84 |
- load_plugin ${PLUGIN} plugin_post_vdr_start |
| 85 |
+ load_plugin ${PLUGIN} plugin_post_vdr_start || return 1 |
| 86 |
done |
| 87 |
return 0 |
| 88 |
} |
| 89 |
|
| 90 |
Modified: gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/post-stop-05-plugins.sh |
| 91 |
=================================================================== |
| 92 |
--- gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/post-stop-05-plugins.sh 2008-03-31 13:02:48 UTC (rev 584) |
| 93 |
+++ gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/post-stop-05-plugins.sh 2008-03-31 19:23:06 UTC (rev 585) |
| 94 |
@@ -4,7 +4,7 @@ |
| 95 |
|
| 96 |
addon_main() { |
| 97 |
for PLUGIN in ${PLUGINS}; do |
| 98 |
- load_plugin ${PLUGIN} plugin_post_vdr_stop |
| 99 |
+ load_plugin ${PLUGIN} plugin_post_vdr_stop || return 1 |
| 100 |
done |
| 101 |
return 0 |
| 102 |
} |
| 103 |
|
| 104 |
Modified: gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/pre-start-95-plugins.sh |
| 105 |
=================================================================== |
| 106 |
--- gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/pre-start-95-plugins.sh 2008-03-31 13:02:48 UTC (rev 584) |
| 107 |
+++ gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/pre-start-95-plugins.sh 2008-03-31 19:23:06 UTC (rev 585) |
| 108 |
@@ -14,7 +14,7 @@ |
| 109 |
init_plugin_params ${PLUGIN} |
| 110 |
|
| 111 |
# call rc-addon of plugin |
| 112 |
- load_plugin ${PLUGIN} plugin_pre_vdr_start |
| 113 |
+ load_plugin ${PLUGIN} plugin_pre_vdr_start || return 1 |
| 114 |
|
| 115 |
# add to commandline |
| 116 |
add_plugin_params_to_vdr_call |
| 117 |
|
| 118 |
Modified: gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/pre-stop-95-plugins.sh |
| 119 |
=================================================================== |
| 120 |
--- gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/pre-stop-95-plugins.sh 2008-03-31 13:02:48 UTC (rev 584) |
| 121 |
+++ gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/pre-stop-95-plugins.sh 2008-03-31 19:23:06 UTC (rev 585) |
| 122 |
@@ -4,7 +4,7 @@ |
| 123 |
|
| 124 |
addon_main() { |
| 125 |
for PLUGIN in ${PLUGINS}; do |
| 126 |
- load_plugin ${PLUGIN} plugin_pre_vdr_stop |
| 127 |
+ load_plugin ${PLUGIN} plugin_pre_vdr_stop || return 1 |
| 128 |
done |
| 129 |
return 0 |
| 130 |
} |
| 131 |
|
| 132 |
-- |
| 133 |
gentoo-commits@l.g.o mailing list |
Archives