From 68ce32cdd4f154597014c4baa3e78361d8c10985 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Mon, 20 Dec 2021 14:53:17 +0100
Subject: setup2hd: small fixes

---
 setup2hd.local.tpl          | 7 ++-----
 setup2hd/setup.liveslak.tpl | 8 +++-----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/setup2hd.local.tpl b/setup2hd.local.tpl
index 8edb7a5..7693159 100644
--- a/setup2hd.local.tpl
+++ b/setup2hd.local.tpl
@@ -50,15 +50,12 @@ live_post_install () {
   cat << EOF > $TMP/tempmsg
 
  @CDISTRO@ Live Edition (@LIVEDE@) has been installed to your hard drive!
- We installed the ${ACT_MODS} active modules (out of ${TOT_MODS} available).
+ We installed the ${ACT_MODS} active modules.
  After rebooting, your installed computer will look exactly like the Live OS.
 
- After finishing system configuration and before rebooting, you can add any further Live modules from /@LIVEMAIN@/addons/ and /@LIVEMAIN@/optional/ to your hard drive, using a command similar to this:
-    # unsquashfs -f -dest $T_PX /mnt/livemedia/@LIVEMAIN@/addons/mymodule.sxz
-
 EOF
   dialog --title "POST INSTALL HINTS AND TIPS" --msgbox "`cat $TMP/tempmsg`" \
-    20 65
+    18 65
   rm $TMP/tempmsg
 
   # Setting MAINSELECT to "CONFIGURE" will call the usual Slackware
diff --git a/setup2hd/setup.liveslak.tpl b/setup2hd/setup.liveslak.tpl
index 3f34852..ccbc8d7 100644
--- a/setup2hd/setup.liveslak.tpl
+++ b/setup2hd/setup.liveslak.tpl
@@ -108,7 +108,7 @@ After that, you will be asked to set the root password." 11 55
 root:${UACCOUNT}:OWNPASS
 root:ALL EXCEPT GROUP wheel:DENY
 EOT
-        chmod 600 ${LIVE_ROOTDIR}/etc/suauth
+        chmod 600 ${T_PX}/etc/suauth
       fi
 
       # Configure sudoers:
@@ -161,7 +161,7 @@ EOT
     # If nvi was not installed, do not use it as a default selection:
     if [ ! -x ${T_PX}/usr/bin/nvi ] && [ -e ${T_PX}/var/log/setup/setup.vi-ex ];
     then
-      sed -e 's/default-item "nvi/"default-item "elvis"/' -i ${T_PX}/var/log/setup/setup.vi-ex
+      sed -e 's/default-item "nvi/default-item "elvis/' -i ${T_PX}/var/log/setup/setup.vi-ex
     fi
     # Prevent SeTconfig from asking redundant questions later on:
     sed -i /usr/share/@LIVEMAIN@/SeTconfig \
@@ -239,13 +239,11 @@ EOT
   - default runlevel
   - keyboard layout
   - language setting
- After finishing system configuration and before rebooting, you can add any further Live modules from /@LIVEMAIN@/addons/ and /@LIVEMAIN@/optional/ to your hard drive, using a command similar to this:
-    # unsquashfs -f -dest $T_PX /mnt/livemedia/@LIVEMAIN@/addons/mymodule.sxz
 
 EOF
     ${DIALOG} --backtitle "@CDISTRO@ Linux Setup (Live Edition)" \
       --title "POST INSTALL HINTS AND TIPS" --msgbox "`cat $TMP/tempmsg`" \
-      20 65
+      18 65
     rm $TMP/tempmsg
 
     MAINSELECT="CONFIGURE"
-- 
cgit v1.2.3