From 3bb48a9c945dbafbbc912ef8d65234d88cb65794 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sat, 24 Oct 2020 22:29:54 +0200
Subject: setup2hd fixes and enhancements

DAW configuration is now properly copied
Extracting the Live OS to hard disk is roughly 10 times faster now,
  after abandoning the fancy progress bar and just showing the rsync status.
Use an enhanced Slackware SeTpasswd to add a non-root user and set
   the root password.
Various syntax and logic errors removed.
---
 setup2hd.tpl | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

(limited to 'setup2hd.tpl')

diff --git a/setup2hd.tpl b/setup2hd.tpl
index 92bbdbc..d600996 100755
--- a/setup2hd.tpl
+++ b/setup2hd.tpl
@@ -164,11 +164,10 @@ while [ 0 ]; do
   --menu "Welcome to @CDISTRO@ Linux Setup (Live Edition).\n\
 Select an option below using the UP/DOWN keys and SPACE or ENTER.\n\
 Alternate keys may also be used: '+', '-', and TAB." 18 72 9 \
-"HELP" "Read the @CDISTRO@ Setup HELP file" \
 "KEYMAP" "Remap your keyboard if you're not using a US one" \
 "ADDSWAP" "Set up your swap partition(s)" \
 "TARGET" "Set up your target partitions" \
-"INSTALL" "Install @CDISTRO@ Live to disk" \
+"INSTALL" "Install @CDISTRO@ to disk" \
 "CONFIGURE" "Reconfigure your Linux system" \
 "EXIT" "Exit @CDISTRO@ Linux Setup" 2> $TMP/hdset
  if [ ! $? = 0 ]; then
@@ -181,10 +180,6 @@ Alternate keys may also be used: '+', '-', and TAB." 18 72 9 \
  # Start checking what to do. Some modules may reset MAINSELECT to run the
  # next item in line.
 
- if [ "$MAINSELECT" = "HELP" ]; then
-  SeTfdHELP
- fi
-
  if [ "$MAINSELECT" = "KEYMAP" ]; then
   SeTkeymap
   if [ -r $TMP/SeTkeymap ]; then
@@ -339,23 +334,14 @@ if [ -f ${T_PX}/etc/fstab ]; then
      --title "@CDISTRO@ Linux Setup is complete" "$@" \
      --msgbox "\nPlease remove the installation disc.\n" 7 40
   fi
-  # Offer to reboot or drop to shell:
+  # Sign off to the user:
   dialog \
+     --clear \
      --title "@CDISTRO@ Linux Setup is complete" "$@" \
-     --yesno \
-     "\nWould you like to reboot your system?\n\n\n\
-If you choose \"No\", you will be dropped to a shell.\n" 11 50
-    retval=$?
-    if [ $retval = 1 ]; then
-      clear
-      echo
-      echo "You may now reboot your system once you are ready."
-      echo "You can issue the 'reboot' command; or if your system has"
-      echo "a keyboard attached, you can use the key combination: control+alt+delete"
-      echo
-    else
-      touch /reboot
-    fi
+     --msgbox "\nInstallation is complete.\n\n
+You can reboot your system whenever you like,\n
+but don't forget to remove this Live medium first.\n" 11 50
+
 fi
 
 # Fix the date:
-- 
cgit v1.2.3