X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Fhv-utilities%2Fhv-backup;h=81e2c969a960dbb7f37323599214f075b0512c17;hb=79d4bc8fa7a701164b00fb3f1f5d04e916041fd4;hp=94ad6d86fb815cb42b9f03f77df994e00cb20c4f;hpb=c264b89a6f18ecf0d5d7c65172ff9dbc23825648;p=hvlinux.git

diff --git a/stage2/hv-utilities/hv-backup b/stage2/hv-utilities/hv-backup
index 94ad6d8..81e2c96 100755
--- a/stage2/hv-utilities/hv-backup
+++ b/stage2/hv-utilities/hv-backup
@@ -19,7 +19,7 @@ source /etc/backup.conf
 ARCHIVE_LABEL="backup-data-amd64-`date '+%Y-%m-%d'`"
 
 # Exclude files list
-EXC_LIST="/tmp/exclude-sockets"
+EXC_LIST="/tmp/hv-backup-exclude-list"
 
 print_usage()
 {
@@ -59,15 +59,32 @@ ARCHIVE_NAME=${BKP_DEST_DIR}/${ARCHIVE_LABEL}.tar.bz2
 
 echo "ARCHIVE_LABEL=$ARCHIVE_LABEL"
 
-# Finding sockets
-find ${DIRECTORIES} -type s > ${EXC_LIST} || exit 1
+cat > ${EXC_LIST} << "EOF"
+/media/*
+/proc/*
+/dev/*
+/sys/*
+/tmp/*
+*.sock
+*.lock
+*/.gvfs*
+EOF
+
+# Finding sockets, and listing them in the exclude file.
+# Errors and warnings must be discarded because of .gvfs directory for example.
+# Even when using -prune option, find exits with a non-zero status when resding
+# .gvfs
+find ${BKP_FILES_LIST} -type s >> ${EXC_LIST} 2> /dev/null
 
 # Archiving
 tar jcf ${ARCHIVE_NAME} ${BKP_FILES_LIST} \
-    --ignore-failed-read \
     --label="${ARCHIVE_LABEL}" \
-    --exclude="*.sock" --exclude="*.lock" --exclude-from=${EXC_LIST} \
-    --absolute-names --totals
+    --ignore-failed-read \
+    --exclude-backups \
+    --exclude-caches \
+    --exclude-from=${EXC_LIST} \
+    --absolute-names \
+    --totals
 
 rm ${EXC_LIST}