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, next has been updated via c0faa0efafca5b9e7881d3570e0c79bbc9a6af77 (commit) from e1731a7b19c19fe786bc6a428c08075fb2b9e9a5 (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 c0faa0efafca5b9e7881d3570e0c79bbc9a6af77 Author: Christian Schmidt maniacikarus@ipfire.org Date: Sat Feb 20 12:41:57 2010 +0100

Fixed all those tar --preserve errors present.

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

Summary of changes: config/backup/backup.pl | 4 ++-- lfs/Config | 6 +++--- lfs/core-updates | 2 +- src/pakfire/lib/functions.sh | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)

Difference in files: diff --git a/config/backup/backup.pl b/config/backup/backup.pl index e67a958..103807f 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -61,11 +61,11 @@ elsif ($ARGV[0] eq 'exclude') { system("rm /tmp/include"); } elsif ($ARGV[0] eq 'restore') { - system("cd / && tar -xvz --preserve -f /tmp/restore.ipf"); + system("cd / && tar -xvz -p -f /tmp/restore.ipf"); } elsif ($ARGV[0] eq 'restoreaddon') { if ( -e "/tmp/$ARGV[1]" ){system("mv /tmp/$ARGV[1] /var/ipfire/backup/addons/backup/$ARGV[1]");} - system("cd / && tar -xvz --preserve -f /var/ipfire/backup/addons/backup/$ARGV[1]"); + system("cd / && tar -xvz -p -f /var/ipfire/backup/addons/backup/$ARGV[1]"); } elsif ($ARGV[0] eq 'cli') { system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten-$ARGV[1].ipf --files-from='$ARGV[2]' --exclude-from='$ARGV[3]'"); diff --git a/lfs/Config b/lfs/Config index 41cea22..bc9375a 100644 --- a/lfs/Config +++ b/lfs/Config @@ -194,12 +194,12 @@ define PAK sed -e 's/KVER/$(KVER)/g' -i /install/packages/package/ROOTFILES chmod 755 /install/packages/package/{{,un}install,update}.sh cd / && tar cf /install/packages/package/files.tmp --files-from=/install/packages/package/ROOTFILES --exclude='#*' \ - --preserve --numeric-owner + -p --numeric-owner # Double tar to remove double files tar xf /install/packages/package/files.tmp -C /install/packages/package/tmp/ \ - --preserve --numeric-owner + -p --numeric-owner rm -f /install/packages/package/files.tmp - cd /install/packages/package/tmp/ && tar -c --preserve --numeric-owner -f /install/packages/package/files * + cd /install/packages/package/tmp/ && tar -c -p --numeric-owner -f /install/packages/package/files * rm -r /install/packages/package/tmp -cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES.tmp mv /install/packages/package/ROOTFILES.tmp /install/packages/package/ROOTFILES diff --git a/lfs/core-updates b/lfs/core-updates index e0962bd..f7f50cf 100644 --- a/lfs/core-updates +++ b/lfs/core-updates @@ -70,7 +70,7 @@ core/%: --exclude='proc/*' --exclude='tmp/ROOTFILES' \ --exclude-from=$(DIR_SRC)/config/rootfiles/$@/exclude mv -f /tmp/ROOTFILES /install/packages/package/ROOTFILES - tar --preserve --numeric-owner -x -C /tmp -f /$(SNAME).tar + tar -p --numeric-owner -x -C /tmp -f /$(SNAME).tar rm -f /$(SNAME).tar cd /tmp && tar cf /install/packages/package/files * && rm -rf * cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES.tmp diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh index 1cc4d81..8bc09a8 100644 --- a/src/pakfire/lib/functions.sh +++ b/src/pakfire/lib/functions.sh @@ -24,7 +24,7 @@

extract_files() { echo "Extracting files..." - tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / + tar xvf /opt/pakfire/tmp/files -p --numeric-owner -C / echo "...Finished." }

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