Tagged version 0.4.10gentoo-vdr-scripts-0.4.10

svn path=/gentoo-vdr-scripts/tags/0.4.10/; revision=690

6 files changed, 43 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 4a31aac..512ff70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for gentoo-vdr-scripts
 # $Id$
 
+*gentoo-vdr-scripts-0.4.10 (08 Feb 2012)
+
+  08 Feb 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +usr/share/vdr/bin/shutdown-custom_cmd.sh, etc/conf.d/vdr.shutdown,
+  etc/init.d/vdr, usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh:
+  moved svdrpsend.pl to svdrpsend command, used from vdr-1.7.23
+
+  08 Feb 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +usr/share/vdr/bin/shutdown-custom_cmd.sh, etc/conf.d/vdr.shutdown,
+  etc/init.d/vdr, usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh:
+  add custom shutdown command, bug 389371
+
+  07 Feb 2012; Joerg Bornkessel <hd_brummy@gentoo.org> ChangeLog:
+  added paludis/cave support to vdrplugin-rebuild script, bug 394251
+
 *gentoo-vdr-scripts-0.4.9 (09 Oct 2011)
 
   09 Oct 2011; Joerg Bornkessel <hd_brummy@gentoo.org> etc/conf.d/vdr,
diff --git a/README b/README
index 7d37b31..40dde5f 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 README for gentoo-vdr-scripts
 $Id$
 
-Version 0.4.9
+Version 0.4.10
 
 This package contains all support scripts for vdr to make
 it like a real set top box.
diff --git a/etc/conf.d/vdr.shutdown b/etc/conf.d/vdr.shutdown
index 80a4b3e..fe87ba0 100644
--- a/etc/conf.d/vdr.shutdown
+++ b/etc/conf.d/vdr.shutdown
@@ -201,6 +201,19 @@
 #   default: no
 #SHUTDOWN_SYSTOHC="yes"
 
+#
+# This may be a custom shutdown command like hibernate, hibernate-ram (from
+# sys-power/hibernate-script for example) or something else
+# which will suspend to RAM (STR, S3) or to disk (STD, S4) instead of
+# powering off the machine, achieving faster startup on resuming.
+# Of course, you then have to make sure when setting up this suspend/resume
+# scenario, to stop the vdr service and unload the dvb modules before
+# suspending, and load the modules and restart vdr when resuming. When using
+# sys-power/hibernate-script, /etc/hibernate/common.conf comes handy for
+# achieving this.
+#
+#SHUTDOWN_CUSTOM_CMD=""
+
 # Debugging variables:
 #DEBUG=1
 #DRY_SHUTDOWN=1
diff --git a/etc/init.d/vdr b/etc/init.d/vdr
index a99c964..7e764d2 100755
--- a/etc/init.d/vdr
+++ b/etc/init.d/vdr
@@ -83,7 +83,7 @@ start_vdr() {
 
 	# show messages if we have any
 	if [ "${vdr_exitcode}" = "0" -a -s "${VDR_LOG_FILE}" ]; then
-		/usr/share/vdr/bin/vdr-bg.sh svdrpsend.pl mesg "Errors: Go to Commands/View VDR Start Log"
+		/usr/share/vdr/bin/vdr-bg.sh svdrpsend mesg "Errors: Go to Commands/View VDR Start Log"
 	fi
 
 	return $vdr_exitcode
@@ -167,5 +167,5 @@ watchdogrestart() {
 
 	( start_vdr )
 
-	svdrpsend.pl mesg "Warning: VDR process died."
+	svdrpsend mesg "Warning: VDR process died."
 }
diff --git a/usr/share/vdr/bin/shutdown-custom_cmd.sh b/usr/share/vdr/bin/shutdown-custom_cmd.sh
new file mode 100644
index 0000000..3a4cda6
--- /dev/null
+++ b/usr/share/vdr/bin/shutdown-custom_cmd.sh
@@ -0,0 +1,6 @@
+# $Id: shutdown-custom_cmd.sh
+# Author:
+#   Lucian Muresan <lucianm@users.sourceforge.net>
+#
+
+${SHUTDOWN_CUSTOM_CMD}
diff --git a/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh b/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh
index 5f8892e..606c2d9 100644
--- a/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh
+++ b/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh
@@ -71,7 +71,12 @@ _set_wakeup() {
 }
 
 _do_shutdown() {
-	SHUTDOWN_METHOD=halt
+	if [ -z "${SHUTDOWN_CUSTOM_CMD}" ]; then
+		SHUTDOWN_METHOD=halt
+	else
+		SHUTDOWN_METHOD=custom_cmd
+	fi
+
 	if [ -e "${reboot_mark_file}" ]; then
 		SHUTDOWN_METHOD=reboot
 	fi