[vdr] 03/05: Removed dvb-modules reloading code (Closes: #512362)

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository vdr.

commit 720c5e6b968efbc85b543696abc5f1dab930b8da
Author: etobi <git at e-tobi.net>
Date:   Sat Mar 14 18:28:45 2015 +0100

    Removed dvb-modules reloading code (Closes: #512362)
---
 debian/changelog    |  1 +
 debian/control      |  2 +-
 debian/runvdr       | 60 -----------------------------------------------------
 debian/runvdr.8     | 27 ------------------------
 debian/vdr.init     |  2 +-
 debian/vdr.install  |  3 +--
 debian/vdr.manpages |  1 -
 7 files changed, 4 insertions(+), 92 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1d1a367..b378739 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ vdr (2.2.0-1) UNRELEASED; urgency=medium
   * Delete /etc/vdr/conf.d on purge
   * Removed the VDR_CHARSET_OVERRIDE from /etc/default/vdr - replaced with the
    --chartab command line argument
+  * Removed dvb-modules reloading code (Closes: #512362)
 
  -- Tobias Grimm <etobi at debian.org>  Sat, 07 Mar 2015 13:02:02 +0100
 
diff --git a/debian/control b/debian/control
index f8252b9..e100136 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Homepage: http://www.tvdr.de/
 
 Package: vdr
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, psmisc
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
 Recommends: lirc, ttf-bitstream-vera | fonts-freefont-ttf
 Suggests: vdr-plugin-dvbsddevice
 Provides: ${vdr:Provides}
diff --git a/debian/runvdr b/debian/runvdr
old mode 100644
new mode 100755
index 29ac360..bd63cc2
--- a/debian/runvdr
+++ b/debian/runvdr
@@ -6,63 +6,9 @@ VDR_ENV="LANG=$VDR_LANG LC_ALL=$VDR_LANG"
 
 VDRCMD="$VDR_ENV /usr/bin/vdr $*"
 
-get_modulenames()
-{
-    MODULES=`lsmod | awk '/^dvb/ {gsub(/,/,"\n", $4); print $4}' | uniq | tac | grep -v "^$"`
-    [ "$MODULES" ] && MODULES="$MODULES dvb_core"
-}
-
-# TODO: check if udev handles this on newer systems!?
-set_permissions()
-{
-    if [ "$USER" -o "$GROUP" ]; then
-        for FILE in av7110_ir budget_ci_ir; do
-            if [ -e "/proc/$FILE" ]; then
-                chown $USER.$GROUP /proc/$FILE
-                chmod +r /proc/$FILE
-            fi
-        done
-    fi
-    chmod o+r /dev/input/event*
-}
-
-load_dvb_modules()
-{
-    if modprobe dvb >/dev/null 2>&1 ; then
-        get_modulenames
-    else
-        if [ "$MODULES" ]; then
-            for MODULE in $MODULES; do
-                modprobe $MODULE >/dev/null 2>&1
-            done
-        else
-            modprobe dvb_ttpci >/dev/null 2>&1
-            get_modulenames
-        fi
-        wait `pidof udev`
-    fi
-    sleep 15
-}
-
-unload_dvb_modules()
-{
-    for MODULE in $MODULES; do
-        rmmod $MODULE >/dev/null 2>&1
-        wait `pidof rmmod`
-    done
-}
-
-
 VDR_ERR=`mktemp -p /tmp vdr-err.XXXXXX`
 
-get_modulenames
-
-[ -z "$MODULES" ] && load_dvb_modules
-
 while (true) do
-
-    set_permissions
-
     eval $VDRCMD >/dev/null 2>"$VDR_ERR"
 
     case $? in
@@ -77,10 +23,4 @@ while (true) do
     esac
 
     logger -t runvdr "restarting VDR"
-    killall -q -TERM /usr/bin/vdr
-    wait `pidof vdr`
-    unload_dvb_modules
-    sleep 2
-    load_dvb_modules
-
 done
diff --git a/debian/runvdr.8 b/debian/runvdr.8
deleted file mode 100644
index 980c3b3..0000000
--- a/debian/runvdr.8
+++ /dev/null
@@ -1,27 +0,0 @@
-.\" Man page for runvdr
-
-.TH runvdr 8
-.SH NAME
-runvdr \- starts VDR and reloads the DVB modules in case of errors
-.SH DESCRIPTION
-.B runvdr
-is called by the init-script of vdr. It acts as a watchdog for vdr and will 
-reload the dvb-modules and vdr, if vdr exits with an exitcode different from 0.
-
-.B runvdr
-will call /usr/bin/vdr and will pass all commandline-options directly to 
-/usr/bin/vdr.
-
-.B runvdr
-needs to be called by root in order to work correct, because it will try to 
-unload/load kernel-modules!
-
-.SH AUTHOR
-This man-page has been written by Thomas Schmidt <thomas at thsnet.de>
-.PP
-Permission is granted to copy, distribute and/or modify this document under
-the terms of the GNU General Public License, Version 2 any
-later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/vdr.init b/debian/vdr.init
index e569641..e3e716c 100644
--- a/debian/vdr.init
+++ b/debian/vdr.init
@@ -19,7 +19,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 NAME=vdr
 DESC="Linux Video Disk Recorder"
 
-DAEMON=/usr/sbin/runvdr
+DAEMON=/usr/lib/vdr/runvdr
 PIDFILE=/var/run/runvdr.pid
 VDRPRG=/usr/bin/vdr
 
diff --git a/debian/vdr.install b/debian/vdr.install
index 5cdd937..731669f 100644
--- a/debian/vdr.install
+++ b/debian/vdr.install
@@ -10,8 +10,7 @@ var/lib/vdr/svdrphosts.conf             etc/vdr/
 var/lib/vdr/*.conf                      usr/share/doc/vdr/examples/
 
 epg2html                                usr/lib/vdr/
-
-debian/runvdr                           usr/sbin/
+debian/runvdr                           usr/lib/vdr/
 
 debian/config-loader.sh                 usr/lib/vdr/
 debian/commands-loader.sh               usr/lib/vdr/
diff --git a/debian/vdr.manpages b/debian/vdr.manpages
deleted file mode 100644
index 441f394..0000000
--- a/debian/vdr.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/runvdr.8

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr.git