vdr/vdr/debian config-loader.sh changelog vdr.init vdr.install

[Tobias Grimm]

Update of /cvsroot/pkg-vdr-dvb/vdr/vdr/debian
In directory haydn:/tmp/cvs-serv21923

Modified Files:
	changelog vdr.init vdr.install 
Added Files:
	config-loader.sh 
Log Message:
extracted loading of config options from init script

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/changelog,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- changelog	30 Dec 2004 23:03:21 -0000	1.67
+++ changelog	2 Jan 2005 17:58:43 -0000	1.68
@@ -20,6 +20,8 @@
       remote is pressed, can now be configured in /etc/default/vdr.
     - When processing the shutdown hooks, no further hook scripts will be
       processed, if one script requests to delay the shutdown.
+    - Extracted loading of VDR deamon config options to separate file for
+      later reuse by other start scripts
   * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
     - Do not run as user root anymore, the user vdr will be created
       and the video-directory and config-files will be changed, so the

Index: vdr.install
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.install,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- vdr.install	6 Nov 2004 18:25:29 -0000	1.8
+++ vdr.install	2 Jan 2005 17:58:43 -0000	1.9
@@ -11,6 +11,7 @@
 debian/commands.custom.conf etc/vdr/command-hooks/
 debian/reccmds.custom.conf  etc/vdr/command-hooks/
 
+debian/config-loader.sh   usr/lib/vdr
 debian/plugin-loader.sh   usr/lib/vdr
 debian/commands-loader.sh usr/lib/vdr
 

--- NEW FILE: config-loader.sh ---
#
# This file is called by /etc/init.d/vdr
#

#
# Edit options for the VDR daemon in /etc/default/vdr !!!
#

# Config-Directory
CFG_DIR="/var/lib/vdr"

# Plugin-Directory
PLUGIN_DIR="/usr/lib/vdr/plugins"

# Plugin Config-Directory
PLUGIN_CFG_DIR="/etc/vdr/plugins"

# Plugin prefix
PLUGIN_PREFIX="libvdr-"

# Command-Hooks Directory
CMDHOOKSDIR="/usr/share/vdr/command-hooks"

# Commmand executed on start, stop and editing of a recording
REC_CMD=/usr/lib/vdr/vdr-recordingaction

# Commmand executed by vdr to shutdown the system
SHUTDOWN_CMD=/usr/lib/vdr/vdr-shutdown

# EPG data file
EPG_FILE=/var/cache/vdr/epg.data

# Username under which vdr will run
USER=vdr

# Groupname under which vdr will run
GROUP=vdr

# Enable / Disable vdr daemon

ENABLED=0

test -f /etc/default/vdr && . /etc/default/vdr

Index: vdr.init
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.init,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- vdr.init	30 Dec 2004 23:03:22 -0000	1.30
+++ vdr.init	2 Jan 2005 17:58:43 -0000	1.31
@@ -3,45 +3,11 @@
 # vdr start-stop script
 #
 
-# Config-Directory
-CFG_DIR="/var/lib/vdr"
-
-# Plugin-Directory
-PLUGIN_DIR="/usr/lib/vdr/plugins"
-
-# Plugin Config-Directory
-PLUGIN_CFG_DIR="/etc/vdr/plugins"
-
-# Plugin prefix
-PLUGIN_PREFIX="libvdr-"
-
-# Command-Hooks Directory
-CMDHOOKSDIR="/usr/share/vdr/command-hooks"
-
-# Commmand executed on start, stop and editing of a recording
-REC_CMD=/usr/lib/vdr/vdr-recordingaction
-
-# Commmand executed by vdr to shutdown the system
-SHUTDOWN_CMD=/usr/lib/vdr/vdr-shutdown
-
-# EPG data file
-EPG_FILE=/var/cache/vdr/epg.data
-
-# Username under which vdr will run
-USER=vdr
-
-# Groupname under which vdr will run
-GROUP=vdr
-
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 NAME=vdr
 DESC="Linux Video Disk Recorder"
 
-# Defaults - don't touch, edit /etc/default/vdr
-
-ENABLED=0
-
-test -f /etc/default/vdr && . /etc/default/vdr
+. /usr/lib/vdr/config-loader.sh
 
 test "$ENABLED" != "0" || exit 0