From 81bbefb8564085cd734e1afcaac7f76978d4fdbb Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Thu, 16 Feb 2023 15:52:21 +0100 Subject: [slx-issue] Wait for clientIP address --- .../slx-issue/data/opt/openslx/scripts/openslx-create_issue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'core/modules/slx-issue/data/opt/openslx/scripts/openslx-create_issue') 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 71c73a48..13153095 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 @@ -25,6 +25,11 @@ declare -rg TMPFILE=$(mktemp -p /run/openslx) declare -rg OUTFILE=/etc/issue . /opt/openslx/config +tries=0 +while [ -z "$SLX_PXE_CLIENT_IP" ] && (( tries++ < 10 )); do + sleep 1 + . /opt/openslx/config +done # get_dmi_info get_dmi_info() { @@ -65,8 +70,10 @@ tmpstatus="$(slx-tools fs_path_space /tmp | awk '{printf "%.1f", $2 / 1024 / 102 # netboot version from cmdline, e.g. boot/bwlp/minilinux/1 to "MiniLinux 1" netboot="$(grep -oP '(?<=slxbase=boot/)\S+' /proc/cmdline | tr '/' ' ')" # capitalize 'm' & 'l' -netboot="${netboot^m}" -netboot="${netboot^^l}" +netboot="${netboot//maxi/Maxi}" +netboot="${netboot//mini/Mini}" +netboot="${netboot//beta/Beta}" +netboot="${netboot//linux/Linux}" virtualbox="$( . "/usr/lib/virtualbox/scripts/generated.sh"; echo "$VBOX_VERSION_STRING" )" -- cgit v1.2.3-55-g7522