summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Reimer <manuel.reimer@gmx.de>2014-02-19 16:27:20 (GMT)
committerManuel Reimer <manuel.reimer@gmx.de>2014-02-19 16:27:20 (GMT)
commitd0ff6ce3b080400b6bf827180495473d778fc73e (patch)
tree42d6f30ff1a8da856592a07aec0a347ae43866f8
parent03282468b5f42dabb58142f239637df80c8f8f61 (diff)
downloadrunvdr-extreme-noxinit.tar.gz
runvdr-extreme-noxinit.tar.bz2
Added X startup with default paramtersnoxinit
-rw-r--r--HISTORY2
-rwxr-xr-xrunvdr5
-rw-r--r--runvdr.conf.example6
-rw-r--r--runvdr.conf.pod10
4 files changed, 17 insertions, 6 deletions
diff --git a/HISTORY b/HISTORY
index ddda57e..f55d93b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5,6 +5,8 @@ XXXX-XX-XX: Version X.X.X
- New: Replaced xinit with own, builtin, X server handling.
Note: Please be sure to have the "-noreset" parameter in your "XSERVER"
command line or the detach feature of softhddevice will fail.
+- New: Now it is possible to set "XSERVER" to "1" to get the X server started
+ with recommended default parameters. Thanks to Copperhead for the hint.
2013-10-20: Version 0.5.0
- New: If VDRPRG is not given, runvdr-extreme defaults to "vdr" in $PATH
diff --git a/runvdr b/runvdr
index 49f5745..1aafc43 100755
--- a/runvdr
+++ b/runvdr
@@ -696,7 +696,7 @@ function StartXServer() {
SIG=
wait $XSERVERPID
- # If anything works as expected, we should have received SIGUSR1.
+ # If everything works as expected, we should have received SIGUSR1.
if [ "$SIG" != "USR1" ]; then
echo "Xserver startup failed with exit code $?!" >&2
exit 1
@@ -838,6 +838,9 @@ if [ "$DVBRESTART" != "0" ] ; then
exit 0
fi
+# Set default X server command if user set "XSERVER" to "1"
+[ "$XSERVER" == "1" ] && XSERVER="/usr/bin/X -nolisten tcp -noreset"
+
# Build up VDR command
BuildCommand || exit 1
diff --git a/runvdr.conf.example b/runvdr.conf.example
index 5f8a798..e540966 100644
--- a/runvdr.conf.example
+++ b/runvdr.conf.example
@@ -180,10 +180,12 @@ DIRNAMES=
# Allow coredumps if USER= is given (debugging)
# USERDUMP="1"
-# Fire up own X server as output device
+# Fire up own X server as output device using recommended default parameters
+# XSERVER="1"
+# You may also set your own X startup command like this:
+# XSERVER="/usr/bin/X -nolisten tcp -config /etc/X11/xorg-runvdr.conf -noreset"
# Note: You need the "-noreset" parameter if you want to use the "detach"
# feature of the softhddevice output plugin
-# XSERVER="/usr/bin/X -nolisten tcp -config /etc/X11/xorg-runvdr.conf -noreset :0"
# X startup commands, called within the X server
#function XSTARTUP() {
diff --git a/runvdr.conf.pod b/runvdr.conf.pod
index b4cad8a..accabd7 100644
--- a/runvdr.conf.pod
+++ b/runvdr.conf.pod
@@ -305,11 +305,15 @@ The command "AddPlugin" is used to load a plugin, defined by the given options.
=head1 X SERVER HANDLING
- XSERVER="/usr/bin/X -nolisten tcp -config /etc/X11/xorg-runvdr.conf -noreset :0"
+ XSERVER="1"
=over 5
-Fire up own X server as output device
+Fire up own X server as output device using recommended default parameters.
+
+You may also set your own X startup command like this:
+
+XSERVER="/usr/bin/X -nolisten tcp -config /etc/X11/xorg-runvdr.conf -noreset"
Note: You need the "-noreset" parameter if you want to use the "detach"
feature of the softhddevice output plugin
@@ -323,7 +327,7 @@ feature of the softhddevice output plugin
=over 5
-X startup commands, called within the X server. Please not, that commands, entered here, are called with root privileges! Be sure to use "su $USER -c" where applicable.
+X startup commands, called within the X server. Please note, that commands, entered here, are called with root privileges! Be sure to use "su $USER -c" where applicable.
=back