diff options
author | James Meyer <james.meyer@operamail.com> | 2011-10-19 18:31:38 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2011-10-19 18:31:38 (GMT) |
commit | d9aad8b00a9f3fb60e456c0e528df90189acb5b3 (patch) | |
tree | 6b9126d2336c62d1e5533798e7348f6a5723f6ba /abs/core/zoneminder/zm.rc.d | |
parent | d9a08ac22f9c6661cf3b478927be321274d10794 (diff) | |
parent | c65b741914b31ac88086e363edc4415eb6aa1686 (diff) | |
download | linhes_pkgbuild-d9aad8b00a9f3fb60e456c0e528df90189acb5b3.zip linhes_pkgbuild-d9aad8b00a9f3fb60e456c0e528df90189acb5b3.tar.gz linhes_pkgbuild-d9aad8b00a9f3fb60e456c0e528df90189acb5b3.tar.bz2 |
Merge remote-tracking branch 'origin/testing' into testing
Conflicts:
abs/core/LinHES-config/PKGBUILD
Diffstat (limited to 'abs/core/zoneminder/zm.rc.d')
-rwxr-xr-x[-rw-r--r--] | abs/core/zoneminder/zm.rc.d | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/abs/core/zoneminder/zm.rc.d b/abs/core/zoneminder/zm.rc.d index 00cd73c..60f684b 100644..100755 --- a/abs/core/zoneminder/zm.rc.d +++ b/abs/core/zoneminder/zm.rc.d @@ -5,7 +5,7 @@ . /etc/rc.d/functions prog=ZoneMinder -ZM_VERSION="1.23.3" +ZM_VERSION="1.24.0" ZM_PATH_BIN="/usr/lib/zm/bin" ZM_CONFIG="/etc/zm.conf" command="$ZM_PATH_BIN/zmpkg.pl" @@ -99,7 +99,7 @@ start() chown -R $ZM_WEB_USER:$ZM_WEB_GROUP /var/run/zm GetPath="select Value from Config where Name='ZM_PATH_SOCKS'" ZM_PATH_SOCK=`echo $GetPath | mysql -B -h $ZM_DB_HOST -u $ZM_DB_USER -p$ZM_DB_PASS $ZM_DB_NAME | grep -v '^Value'` - [ -d $ZM_PATH_SOCK ] || mkdir -m 774 $ZM_PATH_SOCK + [ -d $ZM_PATH_SOCK ] || mkdir -m 774 -p $ZM_PATH_SOCK sudo -u $ZM_WEB_USER test -O $ZM_PATH_SOCK \ || chown -R $ZM_WEB_USER:$ZM_WEB_GROUP $ZM_PATH_SOCK # Setup the log dir |