| 1 |
Author: hd_brummy |
| 2 |
Date: 2012-02-08 00:07:24 +0000 (Wed, 08 Feb 2012) |
| 3 |
New Revision: 691 |
| 4 |
|
| 5 |
Added: |
| 6 |
gentoo-vdr-scripts/trunk/usr/share/vdr/bin/shutdown-custom_cmd.sh |
| 7 |
Modified: |
| 8 |
gentoo-vdr-scripts/trunk/ChangeLog |
| 9 |
gentoo-vdr-scripts/trunk/etc/conf.d/vdr.shutdown |
| 10 |
gentoo-vdr-scripts/trunk/etc/init.d/vdr |
| 11 |
gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh |
| 12 |
Log: |
| 13 |
added paludis/cave support to vdrplugin-rebuild script, bug 394251; add custom shutdown command, bug 389371; moved svdrpsend.pl to svdrpsend command, used from vdr-1.7.23 |
| 14 |
|
| 15 |
|
| 16 |
Modified: gentoo-vdr-scripts/trunk/ChangeLog |
| 17 |
=================================================================== |
| 18 |
--- gentoo-vdr-scripts/trunk/ChangeLog 2012-02-08 00:03:24 UTC (rev 690) |
| 19 |
+++ gentoo-vdr-scripts/trunk/ChangeLog 2012-02-08 00:07:24 UTC (rev 691) |
| 20 |
@@ -1,8 +1,6 @@ |
| 21 |
# ChangeLog for gentoo-vdr-scripts |
| 22 |
# $Id$ |
| 23 |
|
| 24 |
-*gentoo-vdr-scripts-0.4.10 (08 Feb 2012) |
| 25 |
- |
| 26 |
08 Feb 2012; Joerg Bornkessel <hd_brummy@g.o> |
| 27 |
+usr/share/vdr/bin/shutdown-custom_cmd.sh, etc/conf.d/vdr.shutdown, |
| 28 |
etc/init.d/vdr, usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh: |
| 29 |
|
| 30 |
Modified: gentoo-vdr-scripts/trunk/etc/conf.d/vdr.shutdown |
| 31 |
=================================================================== |
| 32 |
--- gentoo-vdr-scripts/trunk/etc/conf.d/vdr.shutdown 2012-02-08 00:03:24 UTC (rev 690) |
| 33 |
+++ gentoo-vdr-scripts/trunk/etc/conf.d/vdr.shutdown 2012-02-08 00:07:24 UTC (rev 691) |
| 34 |
@@ -201,6 +201,19 @@ |
| 35 |
# default: no |
| 36 |
#SHUTDOWN_SYSTOHC="yes" |
| 37 |
|
| 38 |
+# |
| 39 |
+# This may be a custom shutdown command like hibernate, hibernate-ram (from |
| 40 |
+# sys-power/hibernate-script for example) or something else |
| 41 |
+# which will suspend to RAM (STR, S3) or to disk (STD, S4) instead of |
| 42 |
+# powering off the machine, achieving faster startup on resuming. |
| 43 |
+# Of course, you then have to make sure when setting up this suspend/resume |
| 44 |
+# scenario, to stop the vdr service and unload the dvb modules before |
| 45 |
+# suspending, and load the modules and restart vdr when resuming. When using |
| 46 |
+# sys-power/hibernate-script, /etc/hibernate/common.conf comes handy for |
| 47 |
+# achieving this. |
| 48 |
+# |
| 49 |
+#SHUTDOWN_CUSTOM_CMD="" |
| 50 |
+ |
| 51 |
# Debugging variables: |
| 52 |
#DEBUG=1 |
| 53 |
#DRY_SHUTDOWN=1 |
| 54 |
|
| 55 |
Modified: gentoo-vdr-scripts/trunk/etc/init.d/vdr |
| 56 |
=================================================================== |
| 57 |
--- gentoo-vdr-scripts/trunk/etc/init.d/vdr 2012-02-08 00:03:24 UTC (rev 690) |
| 58 |
+++ gentoo-vdr-scripts/trunk/etc/init.d/vdr 2012-02-08 00:07:24 UTC (rev 691) |
| 59 |
@@ -83,7 +83,7 @@ |
| 60 |
|
| 61 |
# show messages if we have any |
| 62 |
if [ "${vdr_exitcode}" = "0" -a -s "${VDR_LOG_FILE}" ]; then |
| 63 |
- /usr/share/vdr/bin/vdr-bg.sh svdrpsend.pl mesg "Errors: Go to Commands/View VDR Start Log" |
| 64 |
+ /usr/share/vdr/bin/vdr-bg.sh svdrpsend mesg "Errors: Go to Commands/View VDR Start Log" |
| 65 |
fi |
| 66 |
|
| 67 |
return $vdr_exitcode |
| 68 |
@@ -167,5 +167,5 @@ |
| 69 |
|
| 70 |
( start_vdr ) |
| 71 |
|
| 72 |
- svdrpsend.pl mesg "Warning: VDR process died." |
| 73 |
+ svdrpsend mesg "Warning: VDR process died." |
| 74 |
} |
| 75 |
|
| 76 |
Added: gentoo-vdr-scripts/trunk/usr/share/vdr/bin/shutdown-custom_cmd.sh |
| 77 |
=================================================================== |
| 78 |
--- gentoo-vdr-scripts/trunk/usr/share/vdr/bin/shutdown-custom_cmd.sh (rev 0) |
| 79 |
+++ gentoo-vdr-scripts/trunk/usr/share/vdr/bin/shutdown-custom_cmd.sh 2012-02-08 00:07:24 UTC (rev 691) |
| 80 |
@@ -0,0 +1,6 @@ |
| 81 |
+# $Id: shutdown-custom_cmd.sh |
| 82 |
+# Author: |
| 83 |
+# Lucian Muresan <lucianm@×××××××××××××××××.net> |
| 84 |
+# |
| 85 |
+ |
| 86 |
+${SHUTDOWN_CUSTOM_CMD} |
| 87 |
|
| 88 |
Modified: gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh |
| 89 |
=================================================================== |
| 90 |
--- gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh 2012-02-08 00:03:24 UTC (rev 690) |
| 91 |
+++ gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh 2012-02-08 00:07:24 UTC (rev 691) |
| 92 |
@@ -71,7 +71,12 @@ |
| 93 |
} |
| 94 |
|
| 95 |
_do_shutdown() { |
| 96 |
- SHUTDOWN_METHOD=halt |
| 97 |
+ if [ -z "${SHUTDOWN_CUSTOM_CMD}" ]; then |
| 98 |
+ SHUTDOWN_METHOD=halt |
| 99 |
+ else |
| 100 |
+ SHUTDOWN_METHOD=custom_cmd |
| 101 |
+ fi |
| 102 |
+ |
| 103 |
if [ -e "${reboot_mark_file}" ]; then |
| 104 |
SHUTDOWN_METHOD=reboot |
| 105 |
fi |
Archives