X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=examples%2Fcron_dump_to_disk%2Fbackup;h=884a10090e92324e1add977b394ac5860988cbea;hp=d19beef0449e64a9f9d171770d6213b42e748595;hb=2e0e9e2e6227c6a71b402124d1f452f091f77676;hpb=9d6d171f1225d1832a44635d9c004b9e7a776b06

diff --git a/examples/cron_dump_to_disk/backup b/examples/cron_dump_to_disk/backup
index d19beef..884a100 100755
--- a/examples/cron_dump_to_disk/backup
+++ b/examples/cron_dump_to_disk/backup
@@ -31,10 +31,10 @@ fi
 # Configuration Parameters
 #
 
-BACKUPPART="/backup"
-BACKUPDIR="current"
+BACKUPPART=${BACKUPPART:-"/backup"}
+BACKUPDIR=${BACKUPDIR:-"current"}
 DUMPLOGARCH="$BACKUPPART/backup.dump.log.gz"
-FSTODUMP="/ /var /home /mnt/hdb1 /usr"
+FSTODUMP=${FSTODUMP:-/ /var /home /mnt/hdb1 /usr}
 DUMPFILESMODE="0644"
 DUMPFILESOWN="root.root"
 
@@ -60,6 +60,8 @@ echo "Filesystems to dump: $FSTODUMP"
 echo -n "Remounting backup partition read-write ... "
 if ( mount $BACKUPPART -o remount,rw &> /dev/null ) then
    echo "done."
+elif ( mount $BACKUPPART -o rw &> /dev/null ) then
+   echo "done."
 else
    echo "failure!"
    echo " There were problems remounting $BACKUPPART in read-write mode!"
@@ -74,24 +76,26 @@ if [ -d $BACKUPPART/$BACKUPDIR -a -w $BACKUPPART/$BACKUPDIR ]; then
    echo "done."
 
    echo -n "Checking backup partition for available space ... "
-   SREQ=`for i in $FSTODUMP;do dump -$DLEVEL -S $i 2> /dev/null;done|awk '{x=x+$1/1048576} END {printf "%6.0f\n", x}'`
-   SAVAILFREE=`df --block-size=1048576 |grep -Ew $BACKUPPART|awk '{printf "%6.0f\n", $4}'`
-   SAVAILDEL=`du -s --block-size=1048576 $BACKUPPART/$BACKUPDIR/. |awk '{printf "%6.0f\n", $1}'`
+   SREQ=`for i in $FSTODUMP; do dump -$DLEVEL -S $i 2> /dev/null; done | awk '{x=x+$1/1048576} END {printf "%6.0f\n", x}'`
+   SAVAILFREE=`df --block-size=1048576 | grep -Fe $BACKUPPART | awk '{printf "%6.0f\n", $4}'`
+   SAVAILDEL=`du -s --block-size=1048576 $BACKUPPART/$BACKUPDIR/. | awk '{printf "%6.0f\n", $1}'`
    SAVAIL=`expr $SAVAILFREE + $SAVAILDEL`
 
    if [ `expr $SAVAIL - $SREQ` -gt "0" ]; then
       echo "done."
-      echo " Available: $SAVAIL MB Required: $SREQ MB."
+      echo "Available: $SAVAIL MB Required: $SREQ MB."
    else
-      echo "no enough space!"
-      echo " There is not enough space left in $BACKUPPART for the backup!"
-      echo " Available: $SAVAIL MB Required: $SREQ MB."
+      echo "not enough space!"
+      echo "There is not enough space left in $BACKUPPART for the backup!"
+      echo "Available: $SAVAIL MB Required: $SREQ MB."
       echo -n "Remounting backup partition read-only ... "
       if ( mount $BACKUPPART -o remount,ro &> /dev/null ) then
          echo "done."
+      elif ( mount $BACKUPPART -o ro &> /dev/null ) then
+         echo "done."
       else
          echo "failure!"
-         echo " There were problems remounting $BACKUPPART in read-only mode!"
+         echo "There were problems remounting $BACKUPPART in read-only mode!"
          echo "Aborting ${BACKUP} System Dump Backup."
          echo "Aborted."
          echo "-------------------------------------------------------------------------------"
@@ -104,7 +108,7 @@ if [ -d $BACKUPPART/$BACKUPDIR -a -w $BACKUPPART/$BACKUPDIR ]; then
    fi
 
    echo -n "Deleting old files ... "
-   if [ `ls -la $BACKUPPART/$BACKUPDIR/|wc -l` -gt "3" ]; then
+   if [ `ls -la $BACKUPPART/$BACKUPDIR/ | wc -l` -gt "3" ]; then
       rm -f $BACKUPPART/$BACKUPDIR/* &> /dev/null
       echo "done."
    else
@@ -117,17 +121,17 @@ if [ -d $BACKUPPART/$BACKUPDIR -a -w $BACKUPPART/$BACKUPDIR ]; then
       if [ "$FS" = "/" ]; then
          FSNAME="root"
       else
-         FSNAME=`echo $FS|tr / _|cut -b 2-`
+         FSNAME=`echo $FS | tr / _ | cut -b 2-`
       fi
       sync
-      echo -n " Starting dump of $FSNAME ( $FS ) ... "
+      echo -n "Starting dump of $FSNAME ( $FS ) ... "
       if ( dump -$DLEVEL $UPDATEDDATE -z -M -s 27306 -f $BACKUPPART/$BACKUPDIR/$FSNAME.$BTYPE. $FS &> $BACKUPPART/$BACKUPDIR/$FSNAME.log ) then
          echo "done."
       else
          echo "problems!"
-         echo " There where problems with the dump of $FSNAME ( $FS )."
-         echo " Check logfile $BACKUPPART/$BACKUPDIR/$FSNAME.log for more info"
-         echo " Also check log archive file $DUMPLOGARCH."
+         echo "There were problems with the dump of $FSNAME ( $FS )."
+         echo "Check log file at $BACKUPPART/$BACKUPDIR/$FSNAME.log.gz"
+         echo "Also check log archive file $DUMPLOGARCH."
       fi
       cat $BACKUPPART/$BACKUPDIR/$FSNAME.log |gzip >> $DUMPLOGARCH
       echo "-------------------------------------------------------------------------------" |gzip >> $DUMPLOGARCH
@@ -145,14 +149,14 @@ if [ -d $BACKUPPART/$BACKUPDIR -a -w $BACKUPPART/$BACKUPDIR ]; then
 
 else
    echo "problems!"
-   echo " There are problems with the directory structure."
-   echo " Check dirs: $BACKUPPART/$BACKUPDIR"
+   echo "There are problems with the directory structure."
+   echo "Check directory: $BACKUPPART/$BACKUPDIR"
    echo -n "Remounting backup partition read-only ... "
    if ( mount $BACKUPPART -o remount,ro &> /dev/null ) then
       echo "done."
    else
       echo "failure!"
-      echo " There were problems remounting $BACKUPPART in read-only mode!"
+      echo "There were problems remounting $BACKUPPART in read-only mode!"
       echo "Aborting ${BACKUP} System Dump Backup."
       echo "Aborted."
       echo "-------------------------------------------------------------------------------"
@@ -169,13 +173,13 @@ if ( mount $BACKUPPART -o remount,ro &> /dev/null ) then
    echo "done."
 else
    echo "failure!"
-   echo " There were problems remounting $BACKUPPART in read-only mode!"
+   echo "There were problems remounting $BACKUPPART in read-only mode!"
    echo "Aborting ${BACKUP} System Dump Backup."
    echo "Aborted."
    echo "-------------------------------------------------------------------------------"
    exit 1
 fi
 
-echo "End of ${BACKUP} System Dump Backup."
+echo "### End of ${BACKUP} System Dump Backup ###"
 echo "Done."
 echo "-------------------------------------------------------------------------------"