From e219410a6d7ba3d6eb018978b67ce50b7c0d670f Mon Sep 17 00:00:00 2001 From: Colossus Date: Fri, 22 Apr 2011 01:35:45 +0200 Subject: [PATCH 1/2] call "/etc/pm/sleep.d/50_tvheadend resume" instead "/usr/bin/tvheadend -C -s -f -u root -g root" (directly), because on a twin tuner card tvheadend is starting two times. --- packages/multimedia/hts-tvheadend/udev.d/76-tvheadend.rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/multimedia/hts-tvheadend/udev.d/76-tvheadend.rules b/packages/multimedia/hts-tvheadend/udev.d/76-tvheadend.rules index 441b76235b..ea762e222b 100644 --- a/packages/multimedia/hts-tvheadend/udev.d/76-tvheadend.rules +++ b/packages/multimedia/hts-tvheadend/udev.d/76-tvheadend.rules @@ -24,7 +24,7 @@ SUBSYSTEM!="dvb", GOTO="end" ENV{DVB_DEVICE_TYPE}!="frontend", GOTO="end" # Start TVHeadend if dvb frontend is starting -ACTION=="add", RUN+="/usr/bin/tvheadend -C -s -f -u root -g root" +ACTION=="add", RUN+="/etc/pm/sleep.d/50_tvheadend resume" ACTION=="remove", RUN+="/usr/bin/killall tvheadend" LABEL="end" From 03e40adf293364e626c5855aea9d8044bac37b38 Mon Sep 17 00:00:00 2001 From: Colossus Date: Fri, 22 Apr 2011 02:26:11 +0200 Subject: [PATCH 2/2] fix for tvheadend startup for dvb cards with more than one tuner, because tvheadend is starting multiple times --- packages/multimedia/hts-tvheadend/install | 3 +++ .../hts-tvheadend/udev.d/76-tvheadend.rules | 2 +- .../hts-tvheadend/udev/tvheadend_startup | 25 +++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100755 packages/multimedia/hts-tvheadend/udev/tvheadend_startup diff --git a/packages/multimedia/hts-tvheadend/install b/packages/multimedia/hts-tvheadend/install index 2eae408e3c..3b2b285d22 100755 --- a/packages/multimedia/hts-tvheadend/install +++ b/packages/multimedia/hts-tvheadend/install @@ -27,3 +27,6 @@ mkdir -p $INSTALL/usr/bin mkdir -p $INSTALL/etc/pm/sleep.d cp $PKG_DIR/sleep.d/* $INSTALL/etc/pm/sleep.d + +mkdir -p $INSTALL/lib/udev + cp $PKG_DIR/udev/* $INSTALL/lib/udev diff --git a/packages/multimedia/hts-tvheadend/udev.d/76-tvheadend.rules b/packages/multimedia/hts-tvheadend/udev.d/76-tvheadend.rules index ea762e222b..8e00208484 100644 --- a/packages/multimedia/hts-tvheadend/udev.d/76-tvheadend.rules +++ b/packages/multimedia/hts-tvheadend/udev.d/76-tvheadend.rules @@ -24,7 +24,7 @@ SUBSYSTEM!="dvb", GOTO="end" ENV{DVB_DEVICE_TYPE}!="frontend", GOTO="end" # Start TVHeadend if dvb frontend is starting -ACTION=="add", RUN+="/etc/pm/sleep.d/50_tvheadend resume" +ACTION=="add", RUN+="/lib/udev/tvheadend_startup" ACTION=="remove", RUN+="/usr/bin/killall tvheadend" LABEL="end" diff --git a/packages/multimedia/hts-tvheadend/udev/tvheadend_startup b/packages/multimedia/hts-tvheadend/udev/tvheadend_startup new file mode 100755 index 0000000000..132e5848a7 --- /dev/null +++ b/packages/multimedia/hts-tvheadend/udev/tvheadend_startup @@ -0,0 +1,25 @@ +#!/bin/sh + +################################################################################ +# 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +if [ ! $(pidof tvheadend) ];then + tvheadend -C -s -f -u root -g root +fi \ No newline at end of file