aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/conf.d/vdr2
-rwxr-xr-xetc/init.d/vdr2
-rwxr-xr-xetc/init.d/wakeup-reboot-halt4
3 files changed, 4 insertions, 4 deletions
diff --git a/etc/conf.d/vdr b/etc/conf.d/vdr
index 6e16b41..1d94ace 100644
--- a/etc/conf.d/vdr
+++ b/etc/conf.d/vdr
@@ -45,7 +45,7 @@
# by the broadcaster. Better: Complain at your broadcaster.
#
# Using vdr-1.6 you can fix it this way:
-# If you subscribed to premiere (german pay tv) you may want ISO8859-15.
+# If you subscribed to SKY (german pay tv) you may want ISO8859-15.
#VDR_CHARSET_OVERRIDE="ISO8859-15"
###########################################################
diff --git a/etc/init.d/vdr b/etc/init.d/vdr
index a72d39b..a99c964 100755
--- a/etc/init.d/vdr
+++ b/etc/init.d/vdr
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-opts="${opts} watchdogrestart"
+extra_commands="watchdogrestart"
. /etc/conf.d/vdr.watchdogd
diff --git a/etc/init.d/wakeup-reboot-halt b/etc/init.d/wakeup-reboot-halt
index d35f897..ae4a2e1 100755
--- a/etc/init.d/wakeup-reboot-halt
+++ b/etc/init.d/wakeup-reboot-halt
@@ -1,9 +1,9 @@
#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-opts="${opts} mark_for_reboot"
+extra_commands="mark_for_reboot"
STATEFILE=/force_reboot_shutdown