Fix RH start scripts to use -u and -g if specified

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1473 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/platforms/redhat/bacula-dir.in b/bacula/platforms/redhat/bacula-dir.in
index 61b3b29e7c0018445fcb0f866e8fb58fc9eba6d4..4b5dc8eee2ad6df650f46086038a7b27329f642c 100755 (executable)
--- a/bacula/platforms/redhat/bacula-dir.in
+++ b/bacula/platforms/redhat/bacula-dir.in
@@ -12,11 +12,22 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
+DIR_USER=@dir_user@
+DIR_GROUP=@dir_group@
+
 RETVAL=0
 case "$1" in
     start)
+       OPTIONS=''
+       if [ "${DIR_USER}" != '' ]; then
+         OPTIONS="${OPTIONS} -u ${DIR_USER}"
+       fi
+                                                                                  
+       if [ "${DIR_GROUP}" != '' ]; then
+         OPTIONS="${OPTIONS} -g ${DIR_GROUP}"
+       fi
        echo -n "Starting the Bacula Director: "
-       daemon @sbindir@/bacula-dir $2 -c @sysconfdir@/bacula-dir.conf
+       daemon @sbindir@/bacula-dir $2 ${OPTIONS} -c @sysconfdir@/bacula-dir.conf
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch @subsysdir@/bacula-dir

diff --git a/bacula/platforms/redhat/bacula-fd.in b/bacula/platforms/redhat/bacula-fd.in
index 7d3e7c0980286b7c178920207362660dec826473..1d5a04290110c3ce9c07749f660767159c4a1cba 100755 (executable)
--- a/bacula/platforms/redhat/bacula-fd.in
+++ b/bacula/platforms/redhat/bacula-fd.in
@@ -12,10 +12,21 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
+FD_USER=@fd_user@
+FD_GROUP=@fd_group@
+
 case "$1" in
     start)
+       OPTIONS=''
+       if [ "${FD_USER}" != '' ]; then
+         OPTIONS="${OPTIONS} -u ${FD_USER}"
+       fi
+                                                                                  
+       if [ "${FD_GROUP}" != '' ]; then
+         OPTIONS="${OPTIONS} -g ${FD_GROUP}"
+       fi
        echo -n "Starting the Bacula File daemon: "
-       daemon @sbindir@/bacula-fd $2 -c @sysconfdir@/bacula-fd.conf
+       daemon @sbindir@/bacula-fd $2 ${OPTIONS} -c @sysconfdir@/bacula-fd.conf
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch @subsysdir@/bacula-fd

diff --git a/bacula/platforms/redhat/bacula-sd.in b/bacula/platforms/redhat/bacula-sd.in
index e58287625d338a806b1b1cdbae54ca4786577f9b..4ba08f22ff8011fc777b8f0f808ffdc8946ca531 100755 (executable)
--- a/bacula/platforms/redhat/bacula-sd.in
+++ b/bacula/platforms/redhat/bacula-sd.in
@@ -12,10 +12,22 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
+SD_USER=@sd_user@
+SD_GROUP=@sd_group@
+
 case "$1" in
     start)
+       OPTIONS=''
+       if [ "${SD_USER}" != '' ]; then
+         OPTIONS="${OPTIONS} -u ${SD_USER}"
+       fi
+                                                                                  
+       if [ "${SD_GROUP}" != '' ]; then
+         OPTIONS="${OPTIONS} -g ${SD_GROUP}"
+       fi
+                                                                                     
        echo -n "Starting the Bacula Storage daemon: "
-       daemon @sbindir@/bacula-sd $2 -c @sysconfdir@/bacula-sd.conf
+       daemon @sbindir@/bacula-sd $2 ${OPTIONS} -c @sysconfdir@/bacula-sd.conf
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch @subsysdir@/bacula-sd