瀏覽代碼

fixes gh-928 Moved all remaining ${SERV} to /etc/init.d/ and removed sysvconfig as a dep for lenny.

Signed-off-by: Philip Schwartz <philip.schwartz@lexisnexis.com>
Philip Schwartz 13 年之前
父節點
當前提交
ebe129b970
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 1 1
      cmake_modules/dependencies/lenny.cmake
  2. 3 3
      initfiles/bash/etc/init.d/hpcc-init.in

+ 1 - 1
cmake_modules/dependencies/lenny.cmake

@@ -1 +1 @@
-set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.34.1, libicu38, libxalan110, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, sudo, openssh-client, openssh-server, expect, sysvconfig")
+set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.34.1, libicu38, libxalan110, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, sudo, openssh-client, openssh-server, expect")

+ 3 - 3
initfiles/bash/etc/init.d/hpcc-init.in

@@ -285,13 +285,13 @@ fi
 if [ ! -z "${compDafilesrv}" ];then
     case "$1" in
         start)
-            ${SERV} dafilesrv status 1>/dev/null 2>/dev/null
+            /etc/init.d/dafilesrv status 1>/dev/null 2>/dev/null
             if [ $? -ne 0 ];then
-              ${SERV} dafilesrv $1 2>/dev/null
+              /etc/init.d/dafilesrv $1 2>/dev/null
             fi
             ;;
         status|setup)
-            ${SERV} dafilesrv ${1} 2>/dev/null
+            /etc/init.d/dafilesrv ${1} 2>/dev/null
             ;;
         stop|restart)
             ;;