[csw-devel] SF.net SVN: gar:[14472] csw/mgar/pkg/bacula/trunk

[bdwalton at users.sourceforge.net]

Revision: 14472
          http://gar.svn.sourceforge.net/gar/?rev=14472&view=rev
Author:   bdwalton
Date:     2011-04-29 16:43:12 +0000 (Fri, 29 Apr 2011)

Log Message:
-----------
bacula/trunk: patch the init scripts so that user/group settings are taken into account

Modified Paths:
--------------
    csw/mgar/pkg/bacula/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/bacula/trunk/files/0003-Make-the-solaris-init-scripts-user-group-aware.patch

Modified: csw/mgar/pkg/bacula/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bacula/trunk/Makefile	2011-04-29 15:25:33 UTC (rev 14471)
+++ csw/mgar/pkg/bacula/trunk/Makefile	2011-04-29 16:43:12 UTC (rev 14472)
@@ -21,6 +21,7 @@
 DISTFILES += postmsg
 PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch
 PATCHFILES += 0002-Clean-up-solaris-install-autostart-targets.patch
+PATCHFILES += 0003-Make-the-solaris-init-scripts-user-group-aware.patch
 
 BUILD_DEP_PKGS  = CSWmysql5devel CSWiconv CSWtcpwrap CSWossldevel
 BUILD_DEP_PKGS += CSWreadline CSWggettext-dev

Added: csw/mgar/pkg/bacula/trunk/files/0003-Make-the-solaris-init-scripts-user-group-aware.patch
===================================================================
--- csw/mgar/pkg/bacula/trunk/files/0003-Make-the-solaris-init-scripts-user-group-aware.patch	                        (rev 0)
+++ csw/mgar/pkg/bacula/trunk/files/0003-Make-the-solaris-init-scripts-user-group-aware.patch	2011-04-29 16:43:12 UTC (rev 14472)
@@ -0,0 +1,101 @@
+From eb01ec6ad7a7ff754cf03302d522f379b1392610 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Fri, 29 Apr 2011 11:53:45 -0400
+Subject: [PATCH] Make the solaris init scripts user/group aware
+
+Import the values for the user and group settings specified by
+configure when generating the solaris init scripts.  Use these values
+for the -u and -g parameters when starting the daemons.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ platforms/solaris/bacula-dir.in |   13 ++++++++++++-
+ platforms/solaris/bacula-fd.in  |   13 ++++++++++++-
+ platforms/solaris/bacula-sd.in  |   13 ++++++++++++-
+ 3 files changed, 36 insertions(+), 3 deletions(-)
+
+diff --git a/platforms/solaris/bacula-dir.in b/platforms/solaris/bacula-dir.in
+index f34e672..c5a3a93 100755
+--- a/platforms/solaris/bacula-dir.in
++++ b/platforms/solaris/bacula-dir.in
+@@ -9,11 +9,22 @@
+ #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
+ #
+ 
++DIR_USER=@dir_user@
++DIR_GROUP=@dir_group@
++DIR_OPTIONS=''
++
+ RETVAL=0
+ case "$1" in
+     start)
++       if [ "${DIR_USER}" != '' ]; then
++          DIR_OPTIONS="${DIR_OPTIONS} -u ${DIR_USER}"
++       fi
++       if [ "${DIR_GROUP}" != '' ]; then
++          DIR_OPTIONS="${DIR_OPTIONS} -g ${DIR_GROUP}"
++       fi
++
+        echo "Starting the Bacula Director: "
+-       @sbindir@/bacula-dir $2 -c @sysconfdir@/bacula-dir.conf
++       @sbindir@/bacula-dir $2 ${DIR_OPTIONS} -c @sysconfdir@/bacula-dir.conf
+        ;;
+     stop)
+        echo "Stopping the Director daemon: "
+diff --git a/platforms/solaris/bacula-fd.in b/platforms/solaris/bacula-fd.in
+index cd3bef1..eeca38d 100755
+--- a/platforms/solaris/bacula-fd.in
++++ b/platforms/solaris/bacula-fd.in
+@@ -9,10 +9,21 @@
+ #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
+ #
+ 
++FD_USER=@fd_user@
++FD_GROUP=@fd_group@
++FD_OPTIONS=''
++
+ case "$1" in
+     start)
++       if [ "${FD_USER}" != '' ]; then
++          FD_OPTIONS="${FD_OPTIONS} -u ${FD_USER}"
++       fi
++       if [ "${FD_GROUP}" != '' ]; then
++          FD_OPTIONS="${FD_OPTIONS} -g ${FD_GROUP}"
++       fi
++
+        echo "Starting the Bacula File daemon: "
+-       @sbindir@/bacula-fd $2 -c @sysconfdir@/bacula-fd.conf
++       @sbindir@/bacula-fd $2 ${FD_OPTIONS} -c @sysconfdir@/bacula-fd.conf
+        ;;
+     stop)
+        echo "Stopping the Bacula File daemon: "
+diff --git a/platforms/solaris/bacula-sd.in b/platforms/solaris/bacula-sd.in
+index 6a0adb8..c547697 100755
+--- a/platforms/solaris/bacula-sd.in
++++ b/platforms/solaris/bacula-sd.in
+@@ -9,10 +9,21 @@
+ #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
+ #
+ 
++SD_USER=@sd_user@
++SD_GROUP=@sd_group@
++SD_OPTIONS=''
++
+ case "$1" in
+     start)
++       if [ "${SD_USER}" != '' ]; then
++          SD_OPTIONS="${SD_OPTIONS} -u ${SD_USER}"
++       fi
++       if [ "${SD_GROUP}" != '' ]; then
++          SD_OPTIONS="${SD_OPTIONS} -g ${SD_GROUP}"
++       fi
++
+        echo "Starting the Bacula Storage daemon: "
+-       @sbindir@/bacula-sd $2 -c @sysconfdir@/bacula-sd.conf
++       @sbindir@/bacula-sd $2 ${SD_OPTIONS} -c @sysconfdir@/bacula-sd.conf
+        ;;
+     stop)
+        echo "Stopping the Bacula Storage daemon: "
+-- 
+1.7.1
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.