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

[petitboot] / utils / pb-sos

diff --git a/utils/pb-sos b/utils/pb-sos
index 2e9802e6a06fdbcd7a98c38a7a762fe8c501bfdd..e3e8f6bb393bf9309b524790248f22581cb931d8 100755 (executable)
--- 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;;
@@ -63,9 +63,17 @@ fi
 log "Adding dmesg"
 dmesg > /$diagdir/dmesg
 
+# Add Skiboot log
+log "Adding Skiboot log"
+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"