| 1 |
Author: zzam |
| 2 |
Date: 2008-04-20 18:59:03 +0000 (Sun, 20 Apr 2008) |
| 3 |
New Revision: 591 |
| 4 |
|
| 5 |
Modified: |
| 6 |
gentoo-vdr-scripts/trunk/ChangeLog |
| 7 |
gentoo-vdr-scripts/trunk/usr/sbin/acpi-wakeup.sh |
| 8 |
Log: |
| 9 |
More baselayout-2 fixes for acpi wakeup. Fixes wrong utc detection. |
| 10 |
|
| 11 |
Modified: gentoo-vdr-scripts/trunk/ChangeLog |
| 12 |
=================================================================== |
| 13 |
--- gentoo-vdr-scripts/trunk/ChangeLog 2008-04-19 15:57:25 UTC (rev 590) |
| 14 |
+++ gentoo-vdr-scripts/trunk/ChangeLog 2008-04-20 18:59:03 UTC (rev 591) |
| 15 |
@@ -1,6 +1,10 @@ |
| 16 |
# ChangeLog for gentoo-vdr-scripts |
| 17 |
# $Id$ |
| 18 |
|
| 19 |
+ 20 Apr 2008; Matthias Schwarzott <zzam@g.o> |
| 20 |
+ usr/sbin/acpi-wakeup.sh: |
| 21 |
+ More baselayout-2 fixes for acpi wakeup. Fixes wrong utc detection. |
| 22 |
+ |
| 23 |
19 Apr 2008; Matthias Schwarzott <zzam@g.o> |
| 24 |
etc/conf.d/vdr.shutdown, usr/share/vdr/shutdown/shutdown-reboot.sh: |
| 25 |
Give an explicit name to the automagic reboot handling - auto. |
| 26 |
|
| 27 |
Modified: gentoo-vdr-scripts/trunk/usr/sbin/acpi-wakeup.sh |
| 28 |
=================================================================== |
| 29 |
--- gentoo-vdr-scripts/trunk/usr/sbin/acpi-wakeup.sh 2008-04-19 15:57:25 UTC (rev 590) |
| 30 |
+++ gentoo-vdr-scripts/trunk/usr/sbin/acpi-wakeup.sh 2008-04-20 18:59:03 UTC (rev 591) |
| 31 |
@@ -25,11 +25,13 @@ |
| 32 |
{ |
| 33 |
unset clock |
| 34 |
unset CLOCK |
| 35 |
- if [ -f /etc/conf.d/clock ]; then |
| 36 |
- . /etc/conf.d/clock |
| 37 |
- else |
| 38 |
- . /etc/rc.conf |
| 39 |
- fi |
| 40 |
+ local f |
| 41 |
+ for f in /etc/conf.d/hwclock /etc/conf.d/clock /etc/rc.conf; do |
| 42 |
+ if [ -f "${f}" ]; then |
| 43 |
+ . "${f}" |
| 44 |
+ break |
| 45 |
+ fi |
| 46 |
+ done |
| 47 |
clock="${clock:-${CLOCK}}" |
| 48 |
|
| 49 |
[ "${clock}" = "UTC" ] |
| 50 |
@@ -54,7 +56,11 @@ |
| 51 |
Next="${1}" |
| 52 |
|
| 53 |
# write time to RTC now, as it may disable wakeup if done after writing alarm time |
| 54 |
-/etc/init.d/clock --quiet save |
| 55 |
+if [ -x /etc/init.d/hwclock ]; then |
| 56 |
+ /etc/init.d/hwclock --quiet save |
| 57 |
+else |
| 58 |
+ /etc/init.d/clock --quiet save |
| 59 |
+fi |
| 60 |
|
| 61 |
if [ "${Next}" -eq 0 ]; then |
| 62 |
# This hopefully deactivates wakeup |
| 63 |
|
| 64 |
-- |
| 65 |
gentoo-commits@l.g.o mailing list |
Archives