aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--etc/conf.d/vdr7
-rw-r--r--usr/share/vdr/rcscript/pre-start-10-chuid.sh2
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 45de5b5..d8a424f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gentoo-vdr-scripts
# $Id$
+ 03 Jul 2008; Matthias Schwarzott <zzam@gentoo.org>
+ usr/share/vdr/rcscript/pre-start-10-chuid.sh, etc/conf.d/vdr:
+ Add config-setting to disable usage of the vdr -u option.
+
29 Jun 2008; Matthias Schwarzott <zzam@gentoo.org>
etc/conf.d/vdr.shutdown, usr/share/vdr/bin/vdrshutdown-gate.sh,
usr/share/vdr/bin/vdrshutdown-really.sh:
diff --git a/etc/conf.d/vdr b/etc/conf.d/vdr
index d1090f1..c0fbcab 100644
--- a/etc/conf.d/vdr
+++ b/etc/conf.d/vdr
@@ -196,6 +196,13 @@ LOG="3"
# default: yes
#FORCE_OLD_THREADS="yes"
+# do not use vdr -u option to set user
+# and use start-stop-daemon --chuid option
+# This makes vdr behave easier with core-dumps
+# allowed values: yes no
+# default: no
+#FORCE_SETUID_OFF="yes"
+
# for people who really know what they do
# and who want to start vdr as user root
# allowed values: YES no
diff --git a/usr/share/vdr/rcscript/pre-start-10-chuid.sh b/usr/share/vdr/rcscript/pre-start-10-chuid.sh
index f9429eb..f28278a 100644
--- a/usr/share/vdr/rcscript/pre-start-10-chuid.sh
+++ b/usr/share/vdr/rcscript/pre-start-10-chuid.sh
@@ -1,7 +1,7 @@
# $Id$
addon_main() {
if [ "${START_VDR_AS_ROOT}" != "YES" ]; then
- if [ -n "${CAP_CHUID}" ]; then
+ if [ -n "${CAP_CHUID}" -a "${FORCE_SETUID_OFF:-no}" = "no" ]; then
add_param "-u" "vdr"
else
add_daemonctrl_param --chuid vdr