Create make release + add README

diff --git a/rescue/Makefile.in b/rescue/Makefile.in
index e1bb125b693630883b0e6702a4345be724292672..27d653fca15a3dce28875a73ea6b567e6bc94c7a 100755 (executable)
--- a/rescue/Makefile.in
+++ b/rescue/Makefile.in
@@ -47,7 +47,15 @@ Makefiles:
        $(SHELL) config.status
 
 clean:
-       @$(RMF) *~ 1 2 3
+       @$(RMF) *~ 1 2 3 diff
+       @$(RMF) config.log config.out config.status
+       @rm -rf autom4te.cache 
+       @rm -rf bacula-rescue-$(VERSION).tar.gz
+       @for subdir in freebsd linux solaris; do \
+           if [ -f $${subdir}/Makefile ]; then \
+                    (cd $${subdir}; $(MAKE) clean) \
+           fi; \
+       done
 
 # clean for distribution
 distclean: clean
@@ -58,4 +66,16 @@ devclean: clean
            if [ -f $${subdir}/Makefile ]; then \
                     (cd $${subdir}; $(MAKE) devclean) \
            fi; \
+       done
+
+release: clean
+       (cwd=`pwd`; rm -rf /tmp/bacula-rescue-$(VERSION); \
+         cd ..; cp -rp $$cwd /tmp/bacula-rescue-$(VERSION); \
+         cd /tmp; \
+         tar cvfz $$cwd/bacula-rescue-$(VERSION).tar.gz bacula-rescue-$(VERSION); \
+         rm -rf /tmp/bacula-rescue-$(VERSION); \
+         echo " "; \
+         echo "Release is in: $$cwd/bacula-rescue-$(VERSION).tar.gz"; \
+         echo " ")
+
 # ------------------------------------------------------------------------

diff --git a/rescue/README b/rescue/README
new file mode 100644 (file)
index 0000000..4e1da78
--- /dev/null
+++ b/rescue/README
@@ -0,0 +1,74 @@
+
+This is the Bacula CDROM rescue directory. It currently contains
+the following subdirectories:
+
+  Directory          Contents
+  autoconf           Configuration files
+  freebsd            The FreeBSD rescue code (not much)
+  linux              The Linux rescue code -- working
+    cdrom              The Linux CDROM rescue code -- working
+    floppy             The Linux Floppy rescue code deprecated,
+                         probably not working.
+  solaris            The Solaris rescue code (not much)
+
+Build instructions:                       
+
+First, you must configure with:
+
+  cd <rescue>
+  ./configure --with-bacula=<path-to-bacula-source>
+
+  This will find the current Bacula version, and create
+  all the Makefiles from Makefile.in  
+
+  Do not edit the Makefiles or your changes will be lost. Always
+  edit Makefile.in
+
+  There is also a --with-iso=<iso-image> option on configure
+  that allows you to specify a location of an ISO image that
+  already exists, presumably built by your Linux vendor.
+  This option permits remastering of that image and including
+  the Bacula files.  However, this work is incomplete, and I am
+  a bit unsure what its state it.
+
+To actually build the CDROM (Linux only):
+   
+   cd <bacula-source>
+
+   (configure and make your Bacula distribution, if
+    you have not already done this.
+    !!!!!!! Important !!!!!!!!!!
+    You should not configure OpenSSL because there are     
+    no static libraries for some of the components. The
+    same may be true for Python  
+    !!!!!!!!!!!!!!!!!!!!!!!!!!!!)
+
+   cd rescue/linux/cdrom
+   (read the README in this directory)
+   (become root)
+   make
+   make burn
+   make clean 
+   (optionally, you might want to cd to your Bacula
+    source directory and do a "make clean" to remove
+    any files created by root)
+   (become normal user)
+
+ See the README in linux/cdrom for more detailed information
+ on possible modifications for your site or more of the
+ details of building the CDROM.
+
+ The documentation for actually using the CDROM can be found
+ in the Rescue chapter of the Bacula manual.
+
+
+To create a distribution tar file:
+   cd <docs>
+   ./configure --with-bacula=<bacula-source-directory>
+   make clean
+   make
+   make release
+
+   The output will be a .tar.gz file in the current directory
+   with the name bacula-doc-<version>.tar.gz 
+   It will print the name.

diff --git a/rescue/autoconf/configure.in b/rescue/autoconf/configure.in
index 240287796447863ddb71acdb9fc4ed74c6976dfa..9099786a763248c17687159cccdfce4185b4b1c1 100644 (file)
--- a/rescue/autoconf/configure.in
+++ b/rescue/autoconf/configure.in
@@ -140,7 +140,7 @@ AC_SUBST(type)
 # Where to get Bacula source
 # ------------------------------------------
 AC_ARG_WITH(bacula,
-   [  --with-bacula=PATH    specify path to bacula],
+   [  --with-bacula=PATH    specify path to Bacula source],
    [
        if test "x$withval" != "xno" ; then     
          bacula=$withval

diff --git a/rescue/configure b/rescue/configure
index 2b35ded0a1bb9153b50658de57521fbdde033e7b..26ae9f9d3734e4cad45bac02f2abd3abc2b0da3e 100755 (executable)
--- a/rescue/configure
+++ b/rescue/configure
@@ -794,7 +794,7 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-iso=PATH       specify path to iso
   --with-cdrom=PATH    specify path to cdrom
-  --with-bacula=PATH    specify path to bacula
+  --with-bacula=PATH    specify path to Bacula source
 
 _ACEOF
 fi

diff --git a/rescue/linux/Makefile.in b/rescue/linux/Makefile.in
index cca15300954bd502201fcb8b3b05ea665ffbb39c..f6b06c7ce6c167a8a4640db68339723d517a982a 100644 (file)
--- a/rescue/linux/Makefile.in
+++ b/rescue/linux/Makefile.in
@@ -6,6 +6,7 @@ install:
 uninstall:
 
 clean:
+       (cd cdrom; make clean)
 
 distclean:
 

diff --git a/rescue/linux/cdrom/makekernel b/rescue/linux/cdrom/makekernel
index f2aaab5e1c72d5114724bce16c308c99adb8ddc2..bc0f3c89d88b335583a2caa0d87064606bb49651 100755 (executable)
--- a/rescue/linux/cdrom/makekernel
+++ b/rescue/linux/cdrom/makekernel
@@ -6,7 +6,6 @@
 
 TOPDIR=`pwd`
 KERNEL=`uname -r` 
-KERNEL=2.6.11-1.14_FC3
 
 rm -rf roottree/dev
 tar xfz dev.tar.gz -C roottree

diff --git a/rescue/linux/cdrom/rootsbin.list b/rescue/linux/cdrom/rootsbin.list
index 035649e8a8cf89af5e202eea25861dd83c1f499a..2f55e398992a60f80e25d2b0132c68e92ed6f39a 100644 (file)
--- a/rescue/linux/cdrom/rootsbin.list
+++ b/rescue/linux/cdrom/rootsbin.list
@@ -31,6 +31,7 @@ roottree/sbin/dosfsck
 roottree/sbin/du
 roottree/sbin/dump
 roottree/sbin/e2fsck
+roottree/sbin/e2label
 roottree/sbin/egrep
 roottree/sbin/eject
 roottree/sbin/false
@@ -117,6 +118,7 @@ roottree/sbin/nm
 roottree/sbin/nmap
 roottree/sbin/nologin
 roottree/sbin/od
+roottree/sbin/parted
 roottree/sbin/passwd
 roottree/sbin/ping
 roottree/sbin/portmap