diff options
author | Jonathan Bauer | 2021-06-25 14:55:08 +0200 |
---|---|---|
committer | Jonathan Bauer | 2021-06-25 14:55:08 +0200 |
commit | 09f9b20ae36bbbff9e303c52d2a8f2a034cd4f1e (patch) | |
tree | 75f018f5ad995d286de930f0a0c450ab8a208f4b /core/modules/debug-report-bwlp/data/opt/openslx | |
parent | Merge branch 'master' into installer (diff) | |
parent | [clientrequest] add remote debugging modul from Christoph Schulthess (diff) | |
download | mltk-09f9b20ae36bbbff9e303c52d2a8f2a034cd4f1e.tar.gz mltk-09f9b20ae36bbbff9e303c52d2a8f2a034cd4f1e.tar.xz mltk-09f9b20ae36bbbff9e303c52d2a8f2a034cd4f1e.zip |
Merge branch 'master' into installer
Diffstat (limited to 'core/modules/debug-report-bwlp/data/opt/openslx')
-rwxr-xr-x | core/modules/debug-report-bwlp/data/opt/openslx/bin/debug_report | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/core/modules/debug-report-bwlp/data/opt/openslx/bin/debug_report b/core/modules/debug-report-bwlp/data/opt/openslx/bin/debug_report index 2dbb45d1..501cdff0 100755 --- a/core/modules/debug-report-bwlp/data/opt/openslx/bin/debug_report +++ b/core/modules/debug-report-bwlp/data/opt/openslx/bin/debug_report @@ -24,13 +24,17 @@ if [ "$UID" != "0" ]; then exit 1 fi -for URL in $URLS; do - if [ "$URL" = "end" ]; then - echo "Kann den Debug-Report-Server in Freiburg nicht erreichen. :-(" >&2 - exit 1 - fi - curl -L -H "Expect:" -f -s -S --connect-timeout 5 "$URL" > /dev/null && break -done +if [ "$1" = "--local" ]; then + localReport=true +else + for URL in $URLS; do + if [ "$URL" = "end" ]; then + echo "Kann den Debug-Report-Server in Freiburg nicht erreichen. :-(" >&2 + exit 1 + fi + curl -L -H "Expect:" -f -s -S --connect-timeout 5 "$URL" > /dev/null && break + done +fi rm -rf /tmp/debug-report mkdir -p /tmp/debug-report/{static/proc,generated} @@ -123,6 +127,9 @@ echo -n "." fdisk -l -u > "generated/fdisk-out" 2> "generated/fdisk-err" echo -n "." +blkid > "generated/blkid-out" 2> "generated/blkid-err" +echo -n "." + ls -al /dev /dev/disk/* &> "generated/ls-dev-and-disks" echo -n "." @@ -143,6 +150,14 @@ echo "..fertig!" cd /tmp rm -f -- error-report.tar.gz + +if [ "$localReport" = "true" ]; then + dirname="debug-report-$(date +"%Y-%m-%d_%H-%M-%S")" + mv debug-report "$dirname" + echo "Fehlerbericht wird NICHT versendet und liegt unter: $(pwd)/$dirname" + exit +fi + echo -n "Packe Fehlerbericht ein..." if ! tar czf error-report.tar.gz debug-report; then echo "Fehler beim Packen des Berichts!" >&2 |