X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=src%2Fbackupninja.in;h=f0622bd1272a6cf2294beb5a2413b25a79ef7fa9;hb=c836982f43d67d19cceb6c727675fbbc22ae7981;hp=fb6cc16e39eea4d4f917662bff30f5b63017c41f;hpb=c22ad121d9d8b11650b265863c783d9f12c92385;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/src/backupninja.in b/src/backupninja.in
index fb6cc16..f0622bd 100755
--- a/src/backupninja.in
+++ b/src/backupninja.in
@@ -132,7 +132,7 @@ function msg {
 function check_perms() {
    local file=$1
    local perms
-   perms=($(stat -L --printf='%a %g %G %u %U' $file))
+   perms=($(stat -L --format='%a %g %G %u %U' $file))
    local gperm=${perms[0]:1:1}
    local wperm=${perms[0]:2:1}
    local gid=${perms[1]}
@@ -155,8 +155,8 @@ function check_perms() {
 
          *)
            if [ "$gid" != 0 ]; then
-              echo "Configuration files must writable/readable by group ${perms[2]}! Dying on file $file"
-              fatal "Configuration files must writable/readable by group ${perms[2]}! Dying on file $file"
+              echo "Configuration files must not be writable/readable by group ${perms[2]}! Dying on file $file"
+              fatal "Configuration files must not be writable/readable by group ${perms[2]}! Dying on file $file"
            fi
          ;;
          esac
@@ -426,6 +426,7 @@ setfile $conffile
 getconf configdirectory @CFGDIR@/backup.d
 getconf scriptdirectory @datadir@
 getconf reportemail
+getconf reportspace
 getconf reportsuccess yes
 getconf reportwarning yes
 getconf loglevel 3
@@ -476,7 +477,7 @@ errormsg=""
 if [ "$singlerun" ]; then
 	files=$singlerun
 else
-	files=`find -L $configdirectory -mindepth 1 -maxdepth 1 -type f ! -name '.*.swp' | sort -n`
+	files=`find $configdirectory -follow -mindepth 1 -maxdepth 1 -type f ! -name '.*.swp' | sort -n`
 
 	if [ -z "$files" ]; then
 		fatal "No backup actions configured in '$configdirectory', run ninjahelper!"
@@ -526,6 +527,17 @@ if [ $doit == 1 ]; then
 	 		echo ${messages[$i]}
 		done
 		echo -e "$errormsg"
+		if [ "$reportspace" == "yes" ]; then
+			previous=""
+			for i in $(ls "$configdirectory"); do
+			backuploc=$(grep ^directory "$configdirectory"/"$i" | awk '{print $3}')
+			if [ "$backuploc" != "$previous" ]; then
+				mountdev=$(mount | grep "$backuploc" | awk '{print $1}')
+				df -h "$mountdev"
+				previous="$backuploc"
+				fi
+			done
+		fi
 	} | mail -s "backupninja: $hostname $subject" $reportemail
 fi