discover/discover-server: Restrict clients based on uid

[petitboot] / utils / pb-sos

diff --git a/utils/pb-sos b/utils/pb-sos
index 2e9802e6a06fdbcd7a98c38a7a762fe8c501bfdd..44dcabd7b75c0c62e5a4147eed7635b6c3cdf58f 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;;
@@ -43,29 +43,36 @@ do
     shift
 done
 
-mkdir -p /$diagdir
+mkdir -p $diagdir
 
 # Include version of pb-discover
-pb-discover --version > /$diagdir/version
+pb-discover --version > $diagdir/version
 
 # Unconditionally grab relevant /var/log files
 log "Adding files from /var/log"
-cp -r /var/log/messages /var/log/petitboot /$diagdir/
+cp -r /var/log/messages /var/log/petitboot $diagdir/
 
 # Check if pb-discover segfaulted
 if [ -r $corefile ]
 then
        log "Adding core dump"
-       cp /core /$diagdir/
+       cp /core $diagdir/
 fi
 
 # Copy dmesg
 log "Adding dmesg"
-dmesg > /$diagdir/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"