From 0ee9284606fbb600aa05eb5d7a2425bbab5a4855 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sat, 5 Dec 2020 20:41:00 +0100 Subject: setup2hd: major changes - use $DIALOG instead of calling dialog; hopefully we can use Xdialog at some time - warn user if terminal is too small to display fdisk/gdisk interfaces - improve installation time of squashfs modules to harddisk with a factor 6, by using a different way to show progress - tweak dialogs so that they show less empty space - if possible, set sane default selections in menu's to make the installation process smoother - fix many small bugs in user account creation, password dialog, user config extraction, removal of redundant configuration questions etc --- setup2hd/SeTudiskpart.tpl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'setup2hd/SeTudiskpart.tpl') diff --git a/setup2hd/SeTudiskpart.tpl b/setup2hd/SeTudiskpart.tpl index 46bf26b..de671f4 100644 --- a/setup2hd/SeTudiskpart.tpl +++ b/setup2hd/SeTudiskpart.tpl @@ -1,4 +1,8 @@ #!/bin/sh + +# The script defaults to curses dialog but Xdialog is a good alternative: +DIALOG=${DIALOG:-"dialog"} + TMP=/var/log/setup/tmp if [ ! -d $TMP ]; then mkdir -p $TMP @@ -6,7 +10,7 @@ fi # If we do not find any useful disks at all, we must bail: if [ -z "$(lsblk -a -o NAME,SIZE,RM,RO,TYPE,MODEL |tr -s '[:blank:]' ' ' |grep '0 *0 *disk' | grep -v '^ram')" ]; then - dialog --backtitle "@CDISTRO@ Linux Setup (Live Edition)" \ + ${DIALOG} --backtitle "@CDISTRO@ Linux Setup (Live Edition)" \ --title "NO HARD DRIVE DETECTED" \ --msgbox "This machine appears not to have any hard drives installed.\ This setup will not work. Please add a hard drive to the computer first." 10 64 @@ -16,7 +20,7 @@ This setup will not work. Please add a hard drive to the computer first." 10 64 # Generate a list of local hard drives we can write to: rm -f $TMP/tempscript cat < $TMP/tempscript -dialog --stdout \\ +${DIALOG} --stdout \\ --title "SELECT DISK DRIVES" \\ --backtitle "Creating Linux, swap and EFI partitions" \\ --checklist "Select from available drives.\nA disk partitioning utility \\ -- cgit v1.2.3-65-gdbad