| 1 |
Author: zzam |
| 2 |
Date: 2008-06-29 16:26:45 +0000 (Sun, 29 Jun 2008) |
| 3 |
New Revision: 620 |
| 4 |
|
| 5 |
Modified: |
| 6 |
gentoo-vdr-scripts/trunk/ChangeLog |
| 7 |
gentoo-vdr-scripts/trunk/etc/conf.d/vdr.shutdown |
| 8 |
gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-gate.sh |
| 9 |
gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-really.sh |
| 10 |
Log: |
| 11 |
Remove 'Shutdown is retried soon' message. Reduce DRY_SHUTDOWN to one single point. |
| 12 |
|
| 13 |
Modified: gentoo-vdr-scripts/trunk/ChangeLog |
| 14 |
=================================================================== |
| 15 |
--- gentoo-vdr-scripts/trunk/ChangeLog 2008-06-24 16:44:54 UTC (rev 619) |
| 16 |
+++ gentoo-vdr-scripts/trunk/ChangeLog 2008-06-29 16:26:45 UTC (rev 620) |
| 17 |
@@ -1,6 +1,12 @@ |
| 18 |
# ChangeLog for gentoo-vdr-scripts |
| 19 |
# $Id$ |
| 20 |
|
| 21 |
+ 29 Jun 2008; Matthias Schwarzott <zzam@g.o> |
| 22 |
+ etc/conf.d/vdr.shutdown, usr/share/vdr/bin/vdrshutdown-gate.sh, |
| 23 |
+ usr/share/vdr/bin/vdrshutdown-really.sh: |
| 24 |
+ Remove 'Shutdown is retried soon' message. Reduce DRY_SHUTDOWN to one |
| 25 |
+ single point. |
| 26 |
+ |
| 27 |
24 Jun 2008; Matthias Schwarzott <zzam@g.o> |
| 28 |
usr/share/vdr/rcscript/pre-start-98-wait-conditions.sh: |
| 29 |
Fix typo. |
| 30 |
|
| 31 |
Modified: gentoo-vdr-scripts/trunk/etc/conf.d/vdr.shutdown |
| 32 |
=================================================================== |
| 33 |
--- gentoo-vdr-scripts/trunk/etc/conf.d/vdr.shutdown 2008-06-24 16:44:54 UTC (rev 619) |
| 34 |
+++ gentoo-vdr-scripts/trunk/etc/conf.d/vdr.shutdown 2008-06-29 16:26:45 UTC (rev 620) |
| 35 |
@@ -193,5 +193,4 @@ |
| 36 |
|
| 37 |
# Debugging variables: |
| 38 |
#DEBUG=1 |
| 39 |
-#DRY_SHUTDOWN_GATE=1 |
| 40 |
-#DRY_SHUTDOWN_REAL=1 |
| 41 |
+#DRY_SHUTDOWN=1 |
| 42 |
|
| 43 |
Modified: gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-gate.sh |
| 44 |
=================================================================== |
| 45 |
--- gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-gate.sh 2008-06-24 16:44:54 UTC (rev 619) |
| 46 |
+++ gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-gate.sh 2008-06-29 16:26:45 UTC (rev 620) |
| 47 |
@@ -231,7 +231,6 @@ |
| 48 |
check_auto_retry() { |
| 49 |
if [ "${TRY_AGAIN}" -gt 0 -a "${ENABLE_AUTO_RETRY}" = 1 ]; then |
| 50 |
queue_add_wait 1s |
| 51 |
- mesg_q "Shutdown is retried soon" |
| 52 |
retry_shutdown ${TRY_AGAIN} |
| 53 |
fi |
| 54 |
} |
| 55 |
@@ -252,7 +251,7 @@ |
| 56 |
execute_hooks |
| 57 |
|
| 58 |
if is_shutdown_aborted; then |
| 59 |
- mesg_q "Shutdown stopped, because ${ABORT_MESSAGE}" |
| 60 |
+ mesg_q "No Shutdown: ${ABORT_MESSAGE}" |
| 61 |
check_forced_shutdown_possible_next_time |
| 62 |
check_auto_retry |
| 63 |
|
| 64 |
@@ -264,28 +263,22 @@ |
| 65 |
# vdr ALL= NOPASSWD: /usr/share/vdr/bin/vdrshutdown-really.sh |
| 66 |
|
| 67 |
|
| 68 |
-SUDO=/usr/bin/sudo |
| 69 |
-if [ -z "${DRY_SHUTDOWN_GATE}" ]; then |
| 70 |
- ${SUDO} /usr/share/vdr/bin/vdrshutdown-really.sh ${VDR_TIMER_NEXT} |
| 71 |
- case $? in |
| 72 |
- 0) ;; |
| 73 |
- 1) mesg_q "sudo failed" |
| 74 |
- mesg_q "call emerge --config gentoo-vdr-scripts" |
| 75 |
- exit_cleanup 1 |
| 76 |
- ;; |
| 77 |
- *) mesg_q "setting wakeup time not successful" |
| 78 |
- exit_cleanup 1 |
| 79 |
- ;; |
| 80 |
- esac |
| 81 |
- rm "${shutdown_data_dir}/shutdown-time-written" |
| 82 |
- date +%s > "${shutdown_data_dir}/shutdown-time-written" |
| 83 |
-else |
| 84 |
- mesg_q "stopping DRY_SHUTDOWN_GATE=1 - ${VDR_TIMER_NEXT}" |
| 85 |
-fi |
| 86 |
+sudo /usr/share/vdr/bin/vdrshutdown-really.sh "$@" |
| 87 |
+case $? in |
| 88 |
+0) ;; |
| 89 |
+1) mesg_q "sudo failed" |
| 90 |
+ mesg_q "call emerge --config gentoo-vdr-scripts" |
| 91 |
+ exit_cleanup 1 |
| 92 |
+ ;; |
| 93 |
+*) mesg_q "setting wakeup time not successful" |
| 94 |
+ exit_cleanup 1 |
| 95 |
+ ;; |
| 96 |
+esac |
| 97 |
+rm "${shutdown_data_dir}/shutdown-time-written" |
| 98 |
+date +%s > "${shutdown_data_dir}/shutdown-time-written" |
| 99 |
|
| 100 |
- |
| 101 |
if is_forced_shutdown && forced_tests_count_greater_zero; then |
| 102 |
- mesg_q "Shutting down (forced)" |
| 103 |
+ mesg_q "User enforced shutdown" |
| 104 |
else |
| 105 |
mesg_q "Shutting down" |
| 106 |
fi |
| 107 |
|
| 108 |
Modified: gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-really.sh |
| 109 |
=================================================================== |
| 110 |
--- gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-really.sh 2008-06-24 16:44:54 UTC (rev 619) |
| 111 |
+++ gentoo-vdr-scripts/trunk/usr/share/vdr/bin/vdrshutdown-really.sh 2008-06-29 16:26:45 UTC (rev 620) |
| 112 |
@@ -82,7 +82,7 @@ |
| 113 |
done |
| 114 |
[ ${wakeup_ok} = 0 ] && exit 99 |
| 115 |
|
| 116 |
-if [ "${DRY_SHUTDOWN_REAL}" = "1" ]; then |
| 117 |
+if [ "${DRY_SHUTDOWN}" = "1" ]; then |
| 118 |
exit 0 |
| 119 |
fi |
| 120 |
|
| 121 |
|
| 122 |
-- |
| 123 |
gentoo-commits@l.g.o mailing list |
Archives