From c0faa0efafca5b9e7881d3570e0c79bbc9a6af77 Mon Sep 17 00:00:00 2001
From: Christian Schmidt <maniacikarus@ipfire.org>
Date: Sat, 20 Feb 2010 12:41:57 +0100
Subject: [PATCH] Fixed all those tar --preserve errors present.

---
 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(-)

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index e67a958f47..103807fa6d 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 41cea22b51..bc9375ac63 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 e0962bd079..f7f50cf5d9 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 1cc4d810a4..8bc09a8217 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."
 }
 
-- 
2.39.2