This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via f1894c45ddc657360e9e8ad95f567f2b677c4544 (commit) via cb13f50d50b2d87e4e368d8f18ea945656cafa33 (commit) from d0cf29f084d7c47d61a0141e60c12e6cce78d8a8 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit f1894c45ddc657360e9e8ad95f567f2b677c4544 Merge: cb13f50 d0cf29f Author: Christian Schmidt maniacikarus@ipfire.org Date: Tue Mar 15 18:28:51 2011 +0100

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

commit cb13f50d50b2d87e4e368d8f18ea945656cafa33 Author: Christian Schmidt maniacikarus@ipfire.org Date: Tue Mar 15 18:28:07 2011 +0100

Fixed backup not taking user files into account.

-----------------------------------------------------------------------

Summary of changes: config/backup/backup.pl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

Difference in files: diff --git a/config/backup/backup.pl b/config/backup/backup.pl index 103807f..d2d6816 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -46,7 +46,7 @@ if (($ARGV[0] eq 'include') || ($ARGV[0] eq 'iso')) { print DATEI @include; print "/var/log/messages"; close(DATEI); - system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten.ipf --files-from='/tmp/include' --exclude-from='/var/ipfire/backup/exclude'"); + system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten.ipf --files-from='/tmp/include' --exclude-from='/var/ipfire/backup/exclude' --files-from='/var/ipfire/backup/include.user' --exclude-from='/var/ipfire/backup/exclude.user'"); system("rm /tmp/include"); if ($ARGV[0] eq 'iso') { system("/usr/local/bin/backupiso $Jahr$Monat$Monatstag-$Stunden$Minuten &"); @@ -57,7 +57,7 @@ elsif ($ARGV[0] eq 'exclude') { open(DATEI, ">/tmp/include") || die "Could not save temp include file"; print DATEI @include; close(DATEI); - system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten.ipf --files-from='/tmp/include' --exclude-from='/var/ipfire/backup/exclude'"); + system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten.ipf --files-from='/tmp/include' --exclude-from='/var/ipfire/backup/exclude' --files-from='/var/ipfire/backup/include.user' --exclude-from='/var/ipfire/backup/exclude.user'"); system("rm /tmp/include"); } elsif ($ARGV[0] eq 'restore') {

hooks/post-receive -- IPFire 2.x development tree