From 15a8ae71332b5f5289f2f8d67271bb6ff5247873 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 7 Feb 2020 13:47:31 +0100
Subject: [slx-issue] add netboot and vbox versions

---
 .../slx-issue/data/opt/openslx/scripts/openslx-create_issue | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/core/modules/slx-issue/data/opt/openslx/scripts/openslx-create_issue b/core/modules/slx-issue/data/opt/openslx/scripts/openslx-create_issue
index de6331c7..acedf8d5 100755
--- a/core/modules/slx-issue/data/opt/openslx/scripts/openslx-create_issue
+++ b/core/modules/slx-issue/data/opt/openslx/scripts/openslx-create_issue
@@ -63,9 +63,18 @@ else
 fi
 tmpstatus="$(slx-tools fs_path_space /tmp | awk '{printf "%.1f", $2 / 1024 / 1024}')GiB ($tmpstatus)"
 
+# netboot version from cmdline, e.g. boot/bwlp/minilinux/1 to "MiniLinux 1"
+netboot="$(grep -oP '(?<=slxbase=boot/bwlp/)\S+' /proc/cmdline | tr '/' ' ')"
+# capitalize 'm' & 'l'
+netboot="${netboot^m}"
+netboot="${netboot^^l}"
+
+virtualbox="$( . /usr/lib/virtualbox/scripts/generated.sh; echo $VBOX_VERSION_STRING )"
+
 cat >> "$TMPFILE" <<EOF
 System model:%space% $system
 Kernel version:%space% $kernel
+Netboot version:%space% $netboot
 Temporary directory:%space% $tmpstatus
 Boot server:%space% $SLX_PXE_SERVER_IP
 Client address:%space% $SLX_PXE_CLIENT_IP
@@ -82,7 +91,9 @@ fi
 if [ -n "$player" ]; then
 	echo "VMware version:%space% ${player//'"'/}" >> "$TMPFILE"
 fi
-
+if [ -n "$virtualbox" ]; then
+	echo "VirtualBox version:%space% $virtualbox" >> "$TMPFILE"
+fi
 echo "" >> "$TMPFILE"
 
 # Crop to console width
-- 
cgit v1.2.3-55-g7522