diff options
| author |   Joerg Bornkessel <hd_brummy@gentoo.org> | 2012-03-31 22:57:43 +0200 |
|---|---|---|
| committer | Joerg Bornkessel <hd_brummy@gentoo.org> | 2012-03-31 22:57:43 +0200 |
| commit | 9f99af1b13b3e64636620312fbf316d66dff3c01 (patch) | |
| tree | 8b1a0b3139aa314ca8d53743c73c547d6afd6617 | |
| parent | Bumped to version 0.5.2 (diff) | |
| download | gentoo-vdr-scripts-9f99af1b13b3e64636620312fbf316d66dff3c01.tar.gz gentoo-vdr-scripts-9f99af1b13b3e64636620312fbf316d66dff3c01.tar.bz2 gentoo-vdr-scripts-9f99af1b13b3e64636620312fbf316d66dff3c01.zip | |
wakup method acpi is depricated since kernel 2.6.39, use rtc or nvram instead, added a warning message/logger for using acpi wakeup method
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | etc/conf.d/vdr.shutdown | 13 | ||||
| -rw-r--r-- | usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh | 2 | ||||
| -rw-r--r-- | usr/share/vdr/rcscript/pre-start-50-shutdown.sh | 10 |
4 files changed, 27 insertions, 4 deletions
@@ -1,6 +1,12 @@ # ChangeLog for gentoo-vdr-scripts # $Id$ + 31 Mar 2012; Joerg Bornkessel <hd_brummy@gentoo.org> + usr/share/vdr/rcscript/pre-start-50-shutdown.sh, etc/conf.d/vdr.shutdown, + usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh: + wakup method acpi is depricated since kernel 2.6.39, use rtc or nvram + instead, added a warning message/logger for using acpi wakeup method + *gentoo-vdr-scripts-0.5.2 (14 Mar 2012) 06 Mar 2012; Joerg Bornkessel <hd_brummy@gentoo.org> etc/init.d/vdr: diff --git a/etc/conf.d/vdr.shutdown b/etc/conf.d/vdr.shutdown index 2474d1b..202ec68 100644 --- a/etc/conf.d/vdr.shutdown +++ b/etc/conf.d/vdr.shutdown @@ -19,9 +19,16 @@ # "none" is for use of client-only VDR-systems or at least # systems that should not wakeup for timer-recordings or # anything else. -# allowed values: rtc acpi nvram none -# default: try all -#WAKEUP_METHOD="rtc acpi nvram none" +# allowed values: rtc nvram none +# default: try all values +# +# allowed value: acpi +# acpi wakup is deprecated since kernel > 2.6.38 +# if you would like use it, +# you have to set this explicit below +# Note: support will removed in future versions of gentoo-vdr-scripts +# +#WAKEUP_METHOD="" ########################################################### # Wake up once every day # diff --git a/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh b/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh index dbb567f..b19a070 100644 --- a/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh +++ b/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh @@ -46,7 +46,7 @@ set_reboot_needed() { printf "" > "${reboot_mark_file}" } -WAKEUP_METHOD="${WAKEUP_METHOD:-rtc acpi nvram none}" +WAKEUP_METHOD="${WAKEUP_METHOD:-rtc nvram none}" run_wakeup_method() { diff --git a/usr/share/vdr/rcscript/pre-start-50-shutdown.sh b/usr/share/vdr/rcscript/pre-start-50-shutdown.sh index 0f6d94b..1bf6fdb 100644 --- a/usr/share/vdr/rcscript/pre-start-50-shutdown.sh +++ b/usr/share/vdr/rcscript/pre-start-50-shutdown.sh @@ -20,5 +20,15 @@ addon_main() { eerror " or call emerge --config gentoo-vdr-scripts" logger -t vdr "ERROR: Depricated entry in /etc/sudoers, please migrate" fi + + # warning about depricated acpi wakeup kernel > 2.6.38 + if [ "${WAKEUP_METHOD}" = acpi ]; then + ewarn "use of acpi wakeup method is depricated" + einfo "use rtc or nvram instead" + logger -t vdr "WARNING:" + logger -t vdr "use of acpi wakeup method is depricated" + logger -t vdr "use rtc or nvram instead" + fi + return 0 } |