From 672a9e4e7f160a65d1bdae49a65b734a2627a5f1 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sun, 10 Sep 2023 17:14:47 +0200
Subject: Several enhancements to LUKS containers and their support scripts

To name the most important:
- The filesystem inside the containers is no longer limited to ext4 and can
  now be btrfs, ext2, ext4, f2fs, jfs or xfs. The scripts 'iso2usb.sh' and
  'isocomp.sh' now support this filesystem choice via a new '-F' switch.
- The 'upslak.sh' script can now extend the size of your home and persistence
  container files, in case you run out of storage there.
- The internal functions used in 'iso2usb.sh' 'isocomp.sh' and 'upslak.sh'
  are mostly unified now, and I intend to split all functions off into a
  separate file which makes maintenance as well as adding new functionaliy
  easier.
- The 'upslak.sh' script will now create a 'kernelmodules' squashfs module
  and copies it to liveslak's 'addons' directory after updating the boot
  kernel on the USB stick and the kernel-modules inside the initrd image.
  This way, you no longer end up with a broken Live OS if you forgot to
  install a Slackware kernel-modules package inside the persistent Live OS
  prior to running 'upslak.sh' with the '-k' and '-m' parameters.

In addition, the README.txt was updated with these enhancements so that
the liveslak documentation is again completely up to date.
---
 liveinit.tpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'liveinit.tpl')

diff --git a/liveinit.tpl b/liveinit.tpl
index 44d6c1d..0fc46e2 100644
--- a/liveinit.tpl
+++ b/liveinit.tpl
@@ -1463,7 +1463,7 @@ if [ "$RESCUE" = "" ]; then
 
         # Let Slackware mount the unlocked container:
         luksfs=$(blkid /dev/mapper/$luksnam |rev |cut -d'"' -f2 |rev)
-        if ! grep -q /dev/mapper/$luksnam /mnt/overlay/etc/fstab ; then
+        if ! grep -q "^/dev/mapper/$luksnam" /mnt/overlay/etc/fstab ; then
           echo "/dev/mapper/$luksnam  $luksmnt  $luksfs  defaults  1  1" >> /mnt/overlay/etc/fstab
         fi
         # On shutdown, ensure that the container gets locked again:
@@ -1807,7 +1807,7 @@ EOT
   done
   if [ $RUN_DEPMOD -eq 1 ]; then
     # This costs a few seconds in additional boot-up time unfortunately:
-    echo "${MARKER}: Additional kernel module(s) found... need a bit"
+    echo "${MARKER}:  Additional kernel module(s) found... need a bit"
     chroot /mnt/overlay /sbin/depmod -a
   fi
   unset RUN_DEPMOD
@@ -1859,8 +1859,8 @@ fi
 /sbin/udevadm control --exit
 
 unset ERR
-umount /proc
-umount /sys
+umount /proc 2>/dev/null
+umount /sys 2>/dev/null
 umount /run 2>/dev/null
 
 echo "${MARKER}:  Slackware Live system is ready."
-- 
cgit v1.2.3