several minor bug fixes

build/cmake/centos7-test/Dockerfile

@@ -1,3 +1,3 @@
 FROM centos:7
 
-RUN yum install -y yum-utils
+RUN yum install -y yum-utils systemd

cmake/InstallLayout.cmake

@@ -59,6 +59,17 @@ function(install_symlink)
           COMPONENTS "${IN_COMPONENT}-el6"
                      "${IN_COMPONENT}-el7"
                      "${IN_COMPONENT}-deb")
+      elseif("${IN_LINK_DIR}" MATCHES "fdbmonitor")
+        install_symlink_impl(
+          TO "../../${rel_path}bin/${IN_FILE_NAME}"
+          DESTINATION "lib/foundationdb/${IN_LINK_NAME}"
+          COMPONENTS "${IN_COMPONENT}-tgz")
+        install_symlink_impl(
+          TO "../../${rel_path}bin/${IN_FILE_NAME}"
+          DESTINATION "usr/lib/foundationdb/${IN_LINK_NAME}"
+          COMPONENTS "${IN_COMPONENT}-el6"
+                     "${IN_COMPONENT}-el7"
+                     "${IN_COMPONENT}-deb")
       else()
         message(FATAL_ERROR "Unknown LINK_DIR ${IN_LINK_DIR}")
       endif()
@@ -276,7 +287,7 @@ set(CPACK_RPM_SERVER-EL7_PRE_UNINSTALL_SCRIPT_FILE
   ${CMAKE_SOURCE_DIR}/packaging/rpm/scripts/preunserver.sh)
 
 set(CPACK_RPM_SERVER-EL6_PACKAGE_REQUIRES
-  "foundationdb-clients = ${FDB_MAJOR}.${FDB_MINOR}.${FDB_PATCH}, initscripts >= 9.03")
+  "foundationdb-clients = ${FDB_MAJOR}.${FDB_MINOR}.${FDB_PATCH}")
 set(CPACK_RPM_SERVER-EL7_PACKAGE_REQUIRES
   "foundationdb-clients = ${FDB_MAJOR}.${FDB_MINOR}.${FDB_PATCH}")
 #set(CPACK_RPM_java_PACKAGE_REQUIRES

fdbbackup/CMakeLists.txt

@@ -9,9 +9,9 @@ if(NOT OPEN_FOR_IDE)
   install_symlink(
     COMPONENT clients
     FILE_DIR bin
-    LINK_DIR lib
+    LINK_DIR fdbmonitor
     FILE_NAME fdbbackup
-    LINK_NAME foundationdb/backup_agent/backup_agent)
+    LINK_NAME backup_agent/backup_agent)
   install_symlink(
     COMPONENT clients
     FILE_DIR bin

packaging/rpm/scripts/postserver.sh

@@ -8,7 +8,7 @@ if [ $1 -eq 1 ]; then
       NEWDB=1
     fi
 
-    if pidof systemd
+    if pidof systemd > /dev/null
     then
         /usr/bin/systemctl enable foundationdb >/dev/null 2>&1
         /usr/bin/systemctl start foundationdb >/dev/null 2>&1
@@ -21,7 +21,7 @@ if [ $1 -eq 1 ]; then
         /usr/bin/fdbcli -C /etc/foundationdb/fdb.cluster --exec "configure new single memory" --timeout 20 >/dev/null 2>&1
     fi
 else
-    if pidof systemd
+    if pidof systemd > /dev/null
     then
         /usr/bin/systemctl condrestart foundationdb >/dev/null 2>&1
     else