Update doc

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

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 39ab05ff4f008badd4d732e350918a2c3a5a62f3..7ed841640036525301ff17d138bb9c86911ca023 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -1345,7 +1345,6 @@ esac
 
 AC_SUBST(hostname)
 
-
 LIBS="$PTHREAD_LIB $LIBS"
 
 AC_DEFINE_UNQUOTED(lld, "$lld")
@@ -1360,6 +1359,20 @@ dnl# common parts of the Makefile
 MCOMMON=./autoconf/Make.common
 AC_SUBST_FILE(MCOMMON)
 
+dnl# Insanity check
+if test "x${subsysdir}" = "x${sbindir}" ; then
+   echo " "
+   echo " "
+   echo "You have set both --sbindir and --with-subsys-dir"
+   echo "  equal to: ${subsysdir} "
+   echo "This is not permitted. Please reconfigure."
+   echo " "
+   echo "Aborting configuration ..."
+   echo " "
+   echo " "
+   exit 1
+fi 
+
 AC_OUTPUT([autoconf/Make.common \
           Makefile \
           rescue/Makefile \
@@ -1444,6 +1457,18 @@ fi
 CCVERSION=`${CC} --version | cut -b-15`
 CXXVERSION=`${CXX} --version | cut -b-15`
 
+if test "x${subsysdir}" = "x${sbindir}" ; then
+   echo " "
+   echo " "
+   echo "You have set --sbindir and --with-subsys-dir"
+   echo "  both equal to: ${subsysdir} "
+   echo "  This is not permitted. Please reconfigure."
+   echo "Aborting configuration ..."
+   echo " "
+   echo " "
+   exit 1
+fi 
+
 echo "
 Configuration on `date`:
 
@@ -1452,8 +1477,10 @@ Configuration on `date`:
   Source code location:       ${srcdir}
   Install binaries:          ${sbindir}
   Install config files:       ${sysconfdir}
-  Scripts directory          ${scriptdir}
-  Working directory          ${working_dir}
+  Scripts directory:         ${scriptdir}
+  Working directory:         ${working_dir}
+  PID directory:             ${piddir}
+  Subsys directory:          ${subsysdir}
   C Compiler:                ${CC} ${CCVERSION}
   C++ Compiler:              ${CXX} ${CXXVERSION}
   Compiler flags:            ${WCFLAGS} ${CFLAGS} 

diff --git a/bacula/configure b/bacula/configure
index efd748ebe5e83c156f9b257a4baee5ab31cfe969..baba050fbf36fd4d1a1b50b61cc288cb528cd7c3 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -9536,7 +9536,6 @@ esac
 
 
 
-
 LIBS="$PTHREAD_LIB $LIBS"
 
 cat >> confdefs.h <<EOF
@@ -9556,6 +9555,19 @@ EOF
 MCOMMON=./autoconf/Make.common
 
 
+if test "x${subsysdir}" = "x${sbindir}" ; then
+   echo " "
+   echo " "
+   echo "You have set both --sbindir and --with-subsys-dir"
+   echo "  equal to: ${subsysdir} "
+   echo "This is not permitted. Please reconfigure."
+   echo " "
+   echo "Aborting configuration ..."
+   echo " "
+   echo " "
+   exit 1
+fi 
+
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -10186,6 +10198,18 @@ fi
 CCVERSION=`${CC} --version | cut -b-15`
 CXXVERSION=`${CXX} --version | cut -b-15`
 
+if test "x${subsysdir}" = "x${sbindir}" ; then
+   echo " "
+   echo " "
+   echo "You have set --sbindir and --with-subsys-dir"
+   echo "  both equal to: ${subsysdir} "
+   echo "  This is not permitted. Please reconfigure."
+   echo "Aborting configuration ..."
+   echo " "
+   echo " "
+   exit 1
+fi 
+
 echo "
 Configuration on `date`:
 
@@ -10194,8 +10218,10 @@ Configuration on `date`:
   Source code location:       ${srcdir}
   Install binaries:          ${sbindir}
   Install config files:       ${sysconfdir}
-  Scripts directory          ${scriptdir}
-  Working directory          ${working_dir}
+  Scripts directory:         ${scriptdir}
+  Working directory:         ${working_dir}
+  PID directory:             ${piddir}
+  Subsys directory:          ${subsysdir}
   C Compiler:                ${CC} ${CCVERSION}
   C++ Compiler:              ${CXX} ${CXXVERSION}
   Compiler flags:            ${WCFLAGS} ${CFLAGS} 

diff --git a/bacula/kernstodo b/bacula/kernstodo
index b7d08ece8f2528a4f9285bd887372c4178acfa61..5cc3a825ad6ee8a137876309b68afba5c572e845 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -10,9 +10,6 @@ Documentation to do: (a little bit at a time)
 - Document how to use multiple databases.
 - Add a section to the doc on Manual cycling of Volumes.
 
-- Document logrotate
-- Document default file backup
-- Document . command
           
 Testing to do: (painful)
 - that ALL console command line options work and are always implemented
@@ -20,19 +17,29 @@ Testing to do: (painful)
 - multiple simultaneous Volumes
 
 For 1.30 release:
-- Do not ignore SIGCHLD
 - Fix Bare Metal restore problem.
-- Fix "access not allowed" for backup of files on WinXP.
+- Implement create "FileSet"?
+- Test multiple simultaneous Volumes
+
 - Document new transparent Console commands and wait command.
-- Document new immediate File save capability.
+- Document new immediate File save configuration (walk user
+  through first save to file Volume with automatic Volume
+  labeling?).
 - Document OPTIMIZE TABLE in MySQL
-- Fix watchdog pthread crash on Win32
 - Document labeling a whole magazine using "cat"
-- Implement create "FileSet"
+- Document Lutz Kittler's trick of using "Run Before Job" to
+  abort a job on a particular day.
+- Document Ludovic Strappazon's Win32 raw device save/restore.
+- Document not to restore .journal .autofsck
+- Document logrotate
+- Document default file backup
+- Document . command
 
 - Figure out how to use ssh or stunnel to protect Bacula communications.
 
 After 1.30:
+- Fix watchdog pthread crash on Win32
+- Fix "access not allowed" for backup of files on WinXP.
 - Implement "scratch pool" where tapes are defined and can be
   taken by any pool that needs them.
 - Implement restore "current system", but take all files without
@@ -950,3 +957,8 @@ rufus-dir: Volume used once. Marking Volume "File0003" as Used.
 - Add IP address to authentication failures. 
 - Add a default File storage so that new users can do backup
   and restores right away.
+- Forbid sbindir and with-subsys-dir from being the same (otherwise
+  the binary gets deleted when the daemon is stopped in the
+  rc.d/inid.d directory.
+- Do not ignore SIGCHLD
+