summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2011-07-30 00:52:36 +0300
committerVille Skyttä <ville.skytta@iki.fi>2011-07-30 00:52:36 +0300
commit10e18ae583228bbfe5eb066a4a237ac67238892e (patch)
tree56eed218370a594736b964cf64df8a52be8396d1
parent9b5f54cf75c0f36b60c917ef695cda5891c9f7b6 (diff)
downloadvdradmin-am-10e18ae583228bbfe5eb066a4a237ac67238892e.tar.gz
vdradmin-am-10e18ae583228bbfe5eb066a4a237ac67238892e.tar.bz2
Do not require pid dir to exist when not running as a daemon.
-rw-r--r--HISTORY1
-rwxr-xr-xvdradmind.pl2
2 files changed, 2 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 174b7d4..0bdddf3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -10,6 +10,7 @@ VDR-Portal: amair
- Added: -L/--logfile command line arg for overriding config (Ville Skyttä).
- Changed: Honor config logging options with --nofork (Ville Skyttä).
- Changed: Specifying -L or -l turns logging on (Ville Skyttä).
+- Improved: Do not require pid dir when not running as daemon (Ville Skyttä).
2011-06-03: 3.6.8
- Updated: Dutch translation (Submitted by Roel Koelewijn).
diff --git a/vdradmind.pl b/vdradmind.pl
index 5327bf7..1977208 100755
--- a/vdradmind.pl
+++ b/vdradmind.pl
@@ -784,7 +784,7 @@ sub check_permissions {
check_rw_dir($CERTSDIR) if ($UseSSL);
check_rw_dir($TEMPLATECACHE) or $rc = 0;
check_rw_dir($LOGDIR) or $rc = 0;
- check_rw_file($PIDFILE) or $rc = 0;
+ check_rw_file($PIDFILE) or $rc = 0 if $DAEMON;
check_rw_file($CONFFILE) or $rc = 0;
if ($CONFIG{AT_FUNC} || $FEATURES{AUTOTIMER}) {