From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 7 Nov 2005 18:09:58 +0000 (+0000)
Subject: Change autostart install for FreeBSD to look for rc.conf
X-Git-Tag: Release-1.38.1~23
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a19ed98e120684067fc4e607d98abf91964c471a;p=bacula%2Fbacula

Change autostart install for FreeBSD to look for rc.conf
  rather than rc.local as suggested fix for bug #466.


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

diff --git a/bacula/kes-1.38 b/bacula/kes-1.38
index 5c12a155c6..10ca819415 100644
--- a/bacula/kes-1.38
+++ b/bacula/kes-1.38
@@ -4,6 +4,8 @@
 General:
 
 Changes to 1.38.1:
+- Change autostart install for FreeBSD to look for rc.conf  
+  rather than rc.local as suggested fix for bug #466.
 - Apply patch supplied by Eric Bollinger to fix PostgreSQL    
   grant on status. Bug #465
 - Apply patch supplied by Eric Bollinger to fix PostgreSQL
diff --git a/bacula/kes-1.39 b/bacula/kes-1.39
index 70f29dc4bf..b555be0597 100644
--- a/bacula/kes-1.39
+++ b/bacula/kes-1.39
@@ -4,6 +4,8 @@
 General:
 
 Changes to 1.39.0:
+- Change autostart install for FreeBSD to look for rc.conf  
+  rather than rc.local as suggested fix for bug #466.
 - Apply patch supplied by Eric Bollinger to fix PostgreSQL    
   grant on status. Bug #465
 - Apply patch supplied by Eric Bollinger to fix PostgreSQL
diff --git a/bacula/platforms/freebsd/Makefile.in b/bacula/platforms/freebsd/Makefile.in
index 960a8676d8..8855885714 100644
--- a/bacula/platforms/freebsd/Makefile.in
+++ b/bacula/platforms/freebsd/Makefile.in
@@ -23,17 +23,17 @@ install-autostart-fd:
 	@echo "FreeBSD platform installation"
 	$(INSTALL_PROGRAM) -m 744 bacula-fd /etc/rc.bacula-fd
 	@-today="`date +%Y%m%d%H%M`"; \
-	grep -q /etc/rc.bacula-fd /etc/rc.local; \
+	grep -q /etc/rc.bacula-fd /etc/rc.conf; \
 	if [ $$? -eq 0 ]; then \
-	    echo "/etc/rc.local already patched"; \
+	    echo "/etc/rc.conf already patched"; \
 	else \
-	    rm -f /etc/rc.local.$$today; \
-	    cp -p /etc/rc.local /etc/rc.local.$$today; \
+	    rm -f /etc/rc.conf.$$today; \
+	    cp -p /etc/rc.conf /etc/rc.conf.$$today; \
 	    ( echo "Start the Bacula File daemon. Do not remove the 'TAG_BACULA_FD' text"; \
 	      echo "if [ -x /etc/rc.bacula-fd ]; then	  # TAG_BACULA_FD"; \
 	      echo "	    /etc/rc.bacula-fd start	  # TAG_BACULA_FD"; \
 	      echo "fi					  # TAG_BACULA_FD"; \
-	    ) >> /etc/rc.local; \
+	    ) >> /etc/rc.conf; \
 	    echo ""; \
 	fi
 
@@ -42,17 +42,17 @@ install-autostart-sd:
 	@echo "FreeBSD platform installation"
 	$(INSTALL_PROGRAM) -m 744 bacula-sd /etc/rc.bacula-sd
 	@-today="`date +%Y%m%d%H%M`"; \
-	grep -q /etc/rc.bacula-sd /etc/rc.local; \
+	grep -q /etc/rc.bacula-sd /etc/rc.conf; \
 	if [ $$? -eq 0 ]; then \
-	    echo "/etc/rc.local already patched"; \
+	    echo "/etc/rc.conf already patched"; \
 	else \
-	    rm -f /etc/rc.local.$$today; \
-	    cp -p /etc/rc.local /etc/rc.local.$$today; \
+	    rm -f /etc/rc.conf.$$today; \
+	    cp -p /etc/rc.conf /etc/rc.conf.$$today; \
 	    ( echo "Start the Bacula Storage daemon. Do not remove the 'TAG_BACULA_SD' text"; \
 	      echo "if [ -x /etc/rc.bacula-sd ]; then	  # TAG_BACULA_SD"; \
 	      echo "	    /etc/rc.bacula-sd start	  # TAG_BACULA_SD"; \
 	      echo "fi					  # TAG_BACULA_SD"; \
-	    ) >> /etc/rc.local; \
+	    ) >> /etc/rc.conf; \
 	    echo ""; \
 	fi
 
@@ -60,17 +60,17 @@ install-autostart-dir:
 	@echo "FreeBSD platform installation"
 	$(INSTALL_PROGRAM) -m 744 bacula-dir /etc/rc.bacula-dir
 	@-today="`date +%Y%m%d%H%M`"; \
-	grep -q /etc/rc.bacula-dir /etc/rc.local; \
+	grep -q /etc/rc.bacula-dir /etc/rc.conf; \
 	if [ $$? -eq 0 ]; then \
-	    echo "/etc/rc.local already patched"; \
+	    echo "/etc/rc.conf already patched"; \
 	else \
-	    rm -f /etc/rc.local.$$today; \
-	    cp -p /etc/rc.local /etc/rc.local.$$today; \
+	    rm -f /etc/rc.conf.$$today; \
+	    cp -p /etc/rc.conf /etc/rc.conf.$$today; \
 	    ( echo "Start the Bacula Director. Do not remove the 'TAG_BACULA_DIR' text"; \
 	      echo "if [ -x /etc/rc.bacula-dir ]; then	  # TAG_BACULA_DIR"; \
 	      echo "	    /etc/rc.bacula-dir start	  # TAG_BACULA_DIR"; \
 	      echo "fi					  # TAG_BACULA_DIR"; \
-	    ) >> /etc/rc.local; \
+	    ) >> /etc/rc.conf; \
 	    echo ""; \
 	fi
 
@@ -83,7 +83,7 @@ uninstall-autostart-fd:
 	@echo "FreeBSD platform uninstall"
 	rm -f /etc/rc.bacula-fd
 	@-today="`date +%Y%m%d%H%M`"; \
-	for f in /etc/rc.local ; do \
+	for f in /etc/rc.conf ; do \
 	    grep -q '# TAG_BACULA_FD' $$f; \
 	    if [ $$? -eq 0 ]; then \
 		    echo "removing Bacula lines from $$f"; \
@@ -100,7 +100,7 @@ uninstall-autostart-sd:
 	@echo "FreeBSD platform uninstall"
 	rm -f /etc/rc.bacula-sd
 	@-today="`date +%Y%m%d%H%M`"; \
-	for f in /etc/rc.local ; do \
+	for f in /etc/rc.conf ; do \
 	    grep -q '# TAG_BACULA_SD' $$f; \
 	    if [ $$? -eq 0 ]; then \
 		    echo "removing Bacula lines from $$f"; \
@@ -116,7 +116,7 @@ uninstall-autostart-dir:
 	@echo "FreeBSD platform uninstall"
 	rm -f /etc/rc.bacula-dir
 	@-today="`date +%Y%m%d%H%M`"; \
-	for f in /etc/rc.local ; do \
+	for f in /etc/rc.conf ; do \
 	    grep -q '# TAG_BACULA_DIR' $$f; \
 	    if [ $$? -eq 0 ]; then \
 		    echo "removing Bacula lines from $$f"; \
diff --git a/bacula/src/version.h b/bacula/src/version.h
index e696708418..4d945e9c5e 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -17,6 +17,8 @@
 /* If this is set stdout will not be closed on startup */
 #define DEVELOPER 1
 
+/* #define USE_BSNPRINTF */
+
 /* Debug flags not normally turned on */
 
 /* #define FILE_SEEK 1 */