X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Fbackup.in;h=8884148fe3dee65daae5ae9d9a3811dd73a5e38e;hb=63c140752fa4535856e47af8d4602fa870f55a81;hp=7baa4a05e6e98a68f2adcced86a23934896e3e8a;hpb=d58eaa815d7afe37a30cd111c3de687b0913fb6a;p=chaz%2Ftar

diff --git a/scripts/backup.in b/scripts/backup.in
index 7baa4a0..8884148 100644
--- a/scripts/backup.in
+++ b/scripts/backup.in
@@ -19,7 +19,7 @@
 
 # Load library routines
 SYSCONFDIR=${SYSCONFDIR-@sysconfdir@}
-. ${LIBPATH-@libexecdir@}/backup.sh
+. ${LIBDIR-@libexecdir@}/backup.sh
 
 DUMP_LEVEL=0
 TIME=
@@ -92,7 +92,7 @@ do
          prev=$option
     	 ;;
   -V|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    	 echo "restore; @PACKAGE@ (@VERSION@)"
+    	 echo "backup (@PACKAGE@ @VERSION@)"
 	 exit 0;;
   -L|--li|--lic|--lice|--licen|--licens|--license)
     	 license
@@ -179,21 +179,15 @@ message 20 "BACKUP_FILES=$BACKUP_FILES"
      if [ $DUMP_LEVEL -eq 0 ]; then
 	 make_level_log ${remotehost}
      else
-	 LF=`level_log_name ${fsname} 0`
-	 pdate=`remote_run "${remotehost}" ls -l $LF | awk '{
-	    printf("%s", $6)
-	    for (i=7;i<NF;i++)
-		printf(" %s", $i)
-	    print "" }'`
-	 echo "Last `prev_level` dump on this filesystem was on $pdate"
-	 remote_run "${remotehost}" cp $LF "`level_log_name temp`"
+	 echo "Last `prev_level` dump on this filesystem was on $PREV_DATE"
+	 remote_run "${remotehost}" cp "`level_log_name ${fsname} $PREV_LEVEL`" "`level_log_name temp`"
      fi
     	
      ${DUMP_BEGIN-:} $DUMP_LEVEL $remotehost $fs $fsname
      backup_host ${remotehost} \
                 "--listed=`level_log_name temp`" \
                 "--label='`print_level` backup of ${fs} on ${remotehost} at ${NOW}'" \
-		-C ${fs} .
+		-C ${ROOT_FS}${fs} .
 
      # `rsh' doesn't exit with the exit status of the remote command.  What
      # stupid lossage.  TODO: think of a reliable workaround.
@@ -218,7 +212,12 @@ message 20 "BACKUP_FILES=$BACKUP_FILES"
 
      date="`date`"
 
-     make_level_log $localhost 
+     if [ $DUMP_LEVEL -eq 0 ]; then
+         make_level_log $localhost 
+     else
+	 echo "Last `prev_level` dump on this filesystem was on $PREV_DATE"
+	 remote_run "${localhost}" cp "`level_log_name MISC $PREV_LEVEL`" "`level_log_name temp`"
+     fi
 
      echo "Backing up miscellaneous files at ${date}"
     
@@ -248,7 +247,9 @@ message 20 "BACKUP_FILES=$BACKUP_FILES"
  echo "."
 ) 2>&1 | tee -a "${LOGFILE}"
 
-echo "Sending the dump log to ${ADMINISTRATOR}"
-mail -s "Results of backup started ${startdate}" ${ADMINISTRATOR} < "${LOGFILE}"
+if test "${ADMINISTRATOR}" != NONE; then
+     echo "Sending the dump log to ${ADMINISTRATOR}"
+     mail -s "Results of backup started ${startdate}" ${ADMINISTRATOR} < "${LOGFILE}"
+fi
 
 # EOF