backupninja.in: words missing in error message

[matthijs/upstream/backupninja.git] / src / backupninja.in

diff --git a/src/backupninja.in b/src/backupninja.in
index e4f5ea73dc53afd6084b5c6563240e0a14d6c0a1..f0622bd1272a6cf2294beb5a2413b25a79ef7fa9 100755 (executable)
--- 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
@@ -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