X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=bin%2Fbackup-rpm;h=409512e87e343943271222bae78e1635b52a9ce4;hp=1f96aedf19a15d5608dfd9493058039bf264aa17;hb=271bd12bf3ce2bbf0e03fa5fe2bec93840d2c247;hpb=6ceb1f61856c24909fa660c2441a2bbc6e59390b

diff --git a/bin/backup-rpm b/bin/backup-rpm
index 1f96aed..409512e 100755
--- a/bin/backup-rpm
+++ b/bin/backup-rpm
@@ -4,14 +4,13 @@ t=/tmp/backup-rpm.$$
 trap "rm -rf $t" EXIT
 rm -rf $t
 mkdir $t
+rpm -qa|sort >$t/rpm-qa
 rpm -qal|sort -u >$t/rpm-qal
 (set +e;rpm -Va >$t/rpm-Va)
-rpm -qa|sort >$t/rpm-qa
 (
 	(find / -xdev -print -type d -print;cat $t/rpm-qal)|sort|uniq -u
 	sed 's#^[^/]*##' <$t/rpm-Va
 	touch $t/patch.list
-	echo $t/rpm-qa
 	for orig in `find / -xdev -name "*-orig"`;do
 		base="`echo $orig|sed 's/-orig$//'`"
 		if [ ! -f "$base" ];then continue;fi
@@ -20,7 +19,8 @@ rpm -qa|sort >$t/rpm-qa
 		echo "$base"
 		echo "$base".patch|tee -a $t/patch.list
 		done
-	)|grep -v '^\(/boot/\|/dev/\|/etc/rc[.]d/rc[0-9][.]d/\|/lib/modules/[^/]*/modules[.]\|/root/\|/tmp/\|/usr/lib/perl5/\|/usr/src/redhat/RPMS/\|/var/cache/\|/var/lib/rpm/\|/var/log/\|/var/run/\|/var/spool/\|/var/lock/\|/usr/share/ntop/\|/usr/lib/locale/locale-archive\|/var/lib/slocate/slocate.db\)' \
+	)|grep -v '^\(/boot/\|/dev/\|/etc/rc[.]d/rc[0-9][.]d/\|/lib/modules/[^/]*/modules[.]\|/root/\|/tmp/\|/usr/lib/perl5/\|/usr/src/redhat/\|/var/cache/\|/var/lib/rpm/\|/var/log/\|/var/run/\|/var/spool/\|/var/lock/\|/usr/share/ntop/\|/usr/lib/locale/locale-archive\|/var/lib/slocate/slocate.db\|/usr/share/man/\|/etc/aliases.db\|/var/tmp/\|/etc/prelink.cache\|/etc/sgml/\|/home/\|/usr/include/tags\|/usr/lib/IPTables-IPv4/\|/usr/lib/python2.3/\|/usr/lib/rpmdb\|/usr/share/texmf/\|/usr/share/yum-cli\|/var/db/nscd/\)' \
 	|grep -v '^(contains no files)$' \
-	|sort -u|(set +e;xargs tar cvvf -)
+	|(echo $t/rpm-qa;cat) \
+	|sort -u|sed 's#^/##'|(cd /;set +e;xargs tar cf -)
 cat $t/patch.list|xargs rm -f