From de20f544f712782f1216b82348cffb8208f9f5ba Mon Sep 17 00:00:00 2001
From: crim50n <crims0n@yandex.ru>
Date: Mon, 18 Sep 2023 18:27:16 +0300
Subject: [PATCH] Update livekitlib

Added support for specifying the system location directory on the selected disk as from=ask/where/is/my/livekitname. Added TYPE="swap" to the filter, because user may have such partition on real hardware and it will be displayed in the list.
---
 livekitlib | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/livekitlib b/livekitlib
index 6ec79be4..e0c5c964 100644
--- a/livekitlib
+++ b/livekitlib
@@ -616,12 +616,34 @@ find_data()
    fi
 
    # If user wants to get asked, ask and periodically update list of devices
-   if [ "$FROM" = "ask" ]; then
-      (while true; do blkid -o full -s TYPE -s LABEL | grep -E -v "/loop|/ram|/zram" >/tmp/0.txt; mv -f /tmp/0.txt /tmp/ask.txt; sleep 1; done) &
+   # boot parameter specified as from=ask or from=ask/directory/where/system/is/installed
+   if echo "$FROM" | grep -q '^ask'; then
+      (while true; do
+         # Among other things, filter out swap, since the user may have a hard disk with a swap partition on the actual hardware.
+         blkid -o full -s TYPE -s LABEL | grep -E -v "/loop|/ram|/zram|TYPE=\"swap\"" | while read -r LINE; do
+            PARTITION=$(echo "$LINE" | awk '{print $1}' | awk -F':' '{print $1}')
+            SIZE=$(fdisk -l "$PARTITION" 2>/dev/null | head -n 1 | awk '/Disk \// {print $3, $4}' | tr -d ",")
+            TYPE=$(echo $LINE | awk -F'TYPE="' '{print $2}' | awk -F'"' '{print $1}')
+            LABEL=$(echo $LINE | awk -F'LABEL="' '{print $2}' | awk -F'"' '{print $1}')
+            echo "$PARTITION: SIZE=\"$SIZE\" TYPE=\"$TYPE\" LABEL=\"$LABEL\" "
+         done >/tmp/0.txt
+         mv -f /tmp/0.txt /tmp/ask.txt
+         sleep 1
+      done) &
       ASKPID=$!
       sleep 1 # give blkid some chance to finish
-      FROM="$(ncurses-menu -t "Look for /$LIVEKITNAME/ directory on:" -f /tmp/ask.txt -s 2>&1 >/dev/tty1 < /dev/tty1)"
-      FROM="$(echo "$FROM" | cut -d : -f 1)/$LIVEKITNAME"
+      if echo "$FROM" | grep -q '^ask/'; then
+         DIR="$(echo "$FROM" | cut -d '/' -f 2-)"
+      else
+         DIR="$LIVEKITNAME"
+      fi
+      DEVICE="$(ncurses-menu -t "Look for /$DIR/ directory on:" -f /tmp/ask.txt -s 2>&1 >/dev/tty1 </dev/tty1)"
+      DEVICE="$(echo "$DEVICE" | cut -d : -f 1)"
+      if echo "$FROM" | grep -q '^ask/'; then
+         FROM="$DEVICE/$(echo "$FROM" | cut -d '/' -f 2-)"
+      else
+         FROM="$DEVICE"
+      fi
       kill $ASKPID
    fi