aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2006-03-21 15:03:37 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2006-03-21 15:03:37 +0000
commit67dd9feff9ef3d7799f05b6b870a6dbd49756d4e (patch)
tree73ce1ade3ab198503040a2ac1f592c72d4ca80c0
parentadded description of shutdown-addon-modules (diff)
downloadgentoo-vdr-scripts-67dd9feff9ef3d7799f05b6b870a6dbd49756d4e.tar.gz
gentoo-vdr-scripts-67dd9feff9ef3d7799f05b6b870a6dbd49756d4e.tar.bz2
gentoo-vdr-scripts-67dd9feff9ef3d7799f05b6b870a6dbd49756d4e.zip
made shutdown retry time configurable
svn path=/gentoo-vdr-scripts/trunk/; revision=205
-rw-r--r--ChangeLog4
-rw-r--r--etc/conf.d/vdr.shutdown8
-rw-r--r--usr/lib/vdr/bin/vdrshutdown-gate.sh4
3 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index dd67eac..10321c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gentoo-vdr-scripts
# $Id$
+ 21 Mar 2006; Matthias Schwarzott <zzam@gentoo.org>
+ etc/conf.d/vdr.shutdown, usr/lib/vdr/bin/vdrshutdown-gate.sh:
+ made shutdown retry time configurable
+
18 Mar 2006; Matthias Schwarzott <zzam@gentoo.org> +README.shutdown:
added description of shutdown-addon-modules
diff --git a/etc/conf.d/vdr.shutdown b/etc/conf.d/vdr.shutdown
index 86da390..8122336 100644
--- a/etc/conf.d/vdr.shutdown
+++ b/etc/conf.d/vdr.shutdown
@@ -115,3 +115,11 @@
# allowed values: number of seconds
# default: 60 seconds
#SHUTDOWN_FORCE_DETECT_INTERVALL="60"
+
+#
+# When shutdown is aborted the default-time to retry
+# the shutdown
+# allowed values: number of minutes
+# default: 10 minutes
+#SHUTDOWN_DEFAULT_RETRY_TIME="10"
+
diff --git a/usr/lib/vdr/bin/vdrshutdown-gate.sh b/usr/lib/vdr/bin/vdrshutdown-gate.sh
index d7fc2c2..74b55d9 100644
--- a/usr/lib/vdr/bin/vdrshutdown-gate.sh
+++ b/usr/lib/vdr/bin/vdrshutdown-gate.sh
@@ -23,7 +23,7 @@ VDR_TIMER_CHANNEL="${3}"
VDR_TIMER_FILENAME="${4}"
VDR_USERSHUTDOWN="${5}"
-: ${DEFAULT_RETRY_TIME:=5}
+: ${SHUTDOWN_DEFAULT_RETRY_TIME:=10}
queue_add_wait() {
@@ -97,7 +97,7 @@ is_forced_shutdown() {
shutdown_common() {
ABORT_MESSAGE="${1}"
SHUTDOWN_ABORT="1"
- TRY_AGAIN="${DEFAULT_RETRY_TIME}"
+ TRY_AGAIN="${SHUTDOWN_DEFAULT_RETRY_TIME}"
}
shutdown_abort() {