From: Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
Date: Tue, 11 Jul 2017 18:04:05 +0000 (-0300)
Subject: pb-sos: effectively compress the pb-sos file with gzip
X-Git-Tag: v1.5.0^0
X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=3fc71b6422efdeb093ca6693553c0c31758a68d1;ds=sidebyside

pb-sos: effectively compress the pb-sos file with gzip

Currently the pb-sos tool creates a TAR file with logs, but without
compressing it using gzip, for example. Even the output of command
says "Compressing...", but in fact no compression is done.

This patch uses gzip to effectively compress the logs. It achieves
83% of compression, observed after a simple experiment.
Also, makes use of $tarflags variable instead of pass the flags
directly in the command call.

Signed-off-by: Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
---

diff --git a/utils/pb-sos b/utils/pb-sos
index 3fa8e89..e3e8f6b 100755
--- a/utils/pb-sos
+++ b/utils/pb-sos
@@ -2,7 +2,7 @@
 
 diagdir="diag"
 tarfile="pb-sos.tar"
-tarflags=""
+tarflags="-cf"
 corefile="/core"
 verbose=0
 
@@ -28,7 +28,7 @@ fi
 while [ $# -gt 0 ]
 do
     case "$1" in
-	-v)	verbose=1; tarflags="$tarflags --verbose";;
+	-v)	verbose=1; tarflags="--verbose $tarflags";;
 	-f)	tarfile="$2"; shift;;
 	-d)	desthost="$2"; shift;;
 	--)	shift; break;;
@@ -69,7 +69,11 @@ cat /sys/firmware/opal/msglog > /$diagdir/msglog
 
 log "Compressing..."
 cd /
-tar $tarflags -cf $tarfile $diagdir
+
+tar $tarflags $tarfile $diagdir
+gzip < $tarfile > $tarfile.gz
+rm -f $tarfile
+tarfile="$tarfile.gz"
 
 echo "Complete, tarfile location $tarfile"