diff -ruN e-smith-backup-2.4.0.old/root/etc/e-smith/events/actions/workstation-backup-dar e-smith-backup-2.4.0/root/etc/e-smith/events/actions/workstation-backup-dar --- e-smith-backup-2.4.0.old/root/etc/e-smith/events/actions/workstation-backup-dar 2013-11-30 21:03:09.000000000 -0800 +++ e-smith-backup-2.4.0/root/etc/e-smith/events/actions/workstation-backup-dar 2013-11-30 22:21:33.000000000 -0800 @@ -94,8 +94,6 @@ $report .= "DAILY BACKUP TO WORKSTATION REPORT \n"; $report .= "================================== \n"; $report .= "Backup of ".$id." started at " .$tim . "\n"; -$report .= "Backup of mysql databases has been done\n"; -$report .= "Mounting backup shared directory \n"; # ping the SMB Host to see if it is awake @@ -139,16 +137,6 @@ $setnum %= $setsmax; } -$report .= sprintf("Using set number %d of %d\n", $setnum + 1, $setsmax); -if ($incnum == 0) -{ - $report .= "Attempt full backup \n"; -} -else -{ - $report .= sprintf("Attempt incremental backup number %d of %d\n", $incnum, $daysinset - 1); -} - # if no set directory, make it my $setname = "set" . $setnum; my $setdirname = $mntdir . "/$id/" . $setname; @@ -160,12 +148,10 @@ &removeTree ("$tmpdir/$id"); &createTree ("$tmpdir/$id"); - $report .= "Backup temp directory $tmpdir/$id is mounted and is writable \n"; -} -else -{ - $report .= "Backup directory $setdirname is mounted \n"; + $report .= "Working directory //$smbhost/$smbshare/tmp_dir/$id\n"; } +$report .= "Destination //$smbhost/$smbshare/$id/$setname\n"; + if ( $incnum == 0 ) { @@ -208,7 +194,7 @@ ldie("Not a permitted day for full backup. Aborting...\nNext full backup in $delay days.\n"); } -$report .= "Backup to $bkname in $id/$setname\n"; +$report .= "Basename $bkname\n"; # calculate real timeout if we timeout incrementals only. # timeout of 88500 is a security for aborting backup within 24h @@ -217,7 +203,7 @@ { $timeout = 88500; } -$report .= "Starting the backup with a timeout of $timeout seconds\n"; +$report .= "Starting the backup with a timeout of ". int ($timeout/(60*60)). " hours\n"; # expanding backup configuration file template @@ -244,7 +230,6 @@ if ($deleteearly ne 'true') # Not DeleteEarly so move backup to $setdirname { - $report .= "Moving backup files to target directory $setdirname \n"; if ($incnum == 0) { &removeTree ($setdirname); @@ -259,8 +244,6 @@ } # update dar_manager catalog -$report .= "Updating catalog\n"; - my %backupfiles = (); my $mntbkdir; my $mounted; @@ -358,24 +341,22 @@ my $df = qx(/bin/df -Ph \"$mntdir\"); if ($df =~ /(\S+)\s+(\S+)\s+(\S+)\s+(\d*%)/) { - $report .= "Disk usage $2, $4 full, $3 available\n"; + $report .= "Destination disk usage $2, $4 full, $3 available\n"; } else { - $report .= "Disk space not available\n"; + $report .= "Destination disk space not available\n"; } # unmount shared folder system("/bin/umount", "-f", "$mntdir"); # time now to update backup configuration - -$report .= "Updating backup configuration data \n"; $backupwk->set_prop('SetNum', $setnum); $backupwk->set_prop('IncNum', $incnum); $tim = ctime(); -$report .= "Backup successfully terminated at : $tim \n"; +$report .= "Backup successfully terminated at $tim \n"; if ($mail eq 'yes') {