Merge branch 'master' into installer

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