From 3e913677f5ee23745fdc234739f91519104e0118 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 12 Mar 2011 01:07:58 +0100 Subject: [PATCH] hts-tvheadend: add udev rule to start tvheadend, rework and rename suspend script Signed-off-by: Stephan Raue --- .../sleep.d/{50tvheadend => 50_tvheadend} | 13 +++++++++- .../76-tvheadend.rules} | 26 +++++++------------ 2 files changed, 22 insertions(+), 17 deletions(-) rename packages/multimedia/hts-tvheadend/sleep.d/{50tvheadend => 50_tvheadend} (81%) rename packages/multimedia/hts-tvheadend/{init.d/81_tvheadend => udev.d/76-tvheadend.rules} (63%) diff --git a/packages/multimedia/hts-tvheadend/sleep.d/50tvheadend b/packages/multimedia/hts-tvheadend/sleep.d/50_tvheadend similarity index 81% rename from packages/multimedia/hts-tvheadend/sleep.d/50tvheadend rename to packages/multimedia/hts-tvheadend/sleep.d/50_tvheadend index e82b06300a..91f3a2fb0e 100755 --- a/packages/multimedia/hts-tvheadend/sleep.d/50tvheadend +++ b/packages/multimedia/hts-tvheadend/sleep.d/50_tvheadend @@ -22,16 +22,27 @@ . /etc/profile +LOCKDIR="/var/lock/" +LOCKFILE="tvheadend" + case "$1" in hibernate|suspend) if [ $(pidof tvheadend) ];then progress "Shutting down HTS TVHeadend for suspending..." + mkdir -p "$LOCKDIR" + touch "$LOCKDIR/$LOCKFILE" killall tvheadend fi ;; + thaw|resume) - . /etc/init.d/81_tvheadend + if [ -f "$LOCKDIR/$LOCKFILE" ];then + progress "Restarting HTS TVHeadend for wakeup..." + tvheadend -C -s -f -u root -g root + rm -rf "$LOCKDIR/$LOCKFILE" + fi ;; + *) exit $NA ;; esac diff --git a/packages/multimedia/hts-tvheadend/init.d/81_tvheadend b/packages/multimedia/hts-tvheadend/udev.d/76-tvheadend.rules similarity index 63% rename from packages/multimedia/hts-tvheadend/init.d/81_tvheadend rename to packages/multimedia/hts-tvheadend/udev.d/76-tvheadend.rules index f3076fa93a..441b76235b 100644 --- a/packages/multimedia/hts-tvheadend/init.d/81_tvheadend +++ b/packages/multimedia/hts-tvheadend/udev.d/76-tvheadend.rules @@ -1,6 +1,6 @@ ################################################################################ -# Copyright (C) 2009-2010 OpenELEC.tv -# http://www.openelec.tv +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) # # This Program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,19 +18,13 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -# start tvheadend tv server -# -# runlevels: openelec, textmode +# only does something with adding "dvb" subsystem devices. +ACTION!="add|remove", GOTO="end" +SUBSYSTEM!="dvb", GOTO="end" +ENV{DVB_DEVICE_TYPE}!="frontend", GOTO="end" -OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml" +# Start TVHeadend if dvb frontend is starting +ACTION=="add", RUN+="/usr/bin/tvheadend -C -s -f -u root -g root" +ACTION=="remove", RUN+="/usr/bin/killall tvheadend" -( - if [ -f "$OPENELEC_SETTINGS" ]; then - TVHEADEND_START=`grep TVHEADEND_START $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` - - if [ "$TVHEADEND_START" = "true" ]; then - progress "starting TV Server" - tvheadend -C -s -f -u root -g root - fi - fi -)& +LABEL="end"