7 files changed, 15 insertions, 17 deletions
diff --git a/source/a/elilo/elilo.SlackBuild b/source/a/elilo/elilo.SlackBuild
index ac31cacdf..57f247959 100755
--- a/source/a/elilo/elilo.SlackBuild
+++ b/source/a/elilo/elilo.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=elilo
 VERSION=${VERSION:-$(echo $PKGNAM*.tar.?z* | rev | cut -f 2 -d - | rev)}
-BUILD=${BUILD:-14}
+BUILD=${BUILD:-15}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/source/a/elilo/eliloconfig b/source/a/elilo/eliloconfig
index ae622634f..bcded54d8 100644
--- a/source/a/elilo/eliloconfig
+++ b/source/a/elilo/eliloconfig
@@ -176,20 +176,10 @@ if [ "$REPLY" = "skip" ]; then
   exit
 fi
 
-# Make sure an interface to read/write EFI variables is present:
-if [ ! -d /sys/firmware/efi/efivars ]; then
-  modprobe efivarfs 1> /dev/null 2> /dev/null
-  sleep 1 # Probably not needed, but playing it safe
-  # Take another look:
-  if [ ! -d /sys/firmware/efi/efivars ]; then
-    # Maybe we have an old kernel, so try the previous /sys/firmware/efi/vars interface instead:
-    modprobe efivars 1> /dev/null 2> /dev/null
-    sleep 1 # Probably not needed, but playing it safe
-  fi
-fi
-# At this point, we fail silently if we don't have either of these directories:
-if [ ! -d /sys/firmware/efi/efivars -a ! -d /sys/firmware/efi/vars ]; then
-  exit
+# Make sure efivarfs is active since we'll need it to
+# change UEFI boot menu entries:
+if [ "$(/bin/ls /sys/firmware/efi/efivars 2> /dev/null | wc -l)" = "0" ]; then
+  mount -t efivarfs none /sys/firmware/efi/efivars
 fi
 
 efibootmgr -v | rev | cut -f 2- | rev | grep Boot0 | grep Slackware | while read line ; do
diff --git a/source/d/indent/indent.SlackBuild b/source/d/indent/indent.SlackBuild
index 65a8fc525..4947d47b0 100755
--- a/source/d/indent/indent.SlackBuild
+++ b/source/d/indent/indent.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=indent
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/d/scons/scons.url b/source/d/scons/scons.url
new file mode 100644
index 000000000..de9bbff15
--- /dev/null
+++ b/source/d/scons/scons.url
@@ -0,0 +1 @@
+http://sourceforge.net/projects/scons/files
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index a0269e4de..4c0fd7f23 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,6 @@
+Tue Mar 21 21:05:06 UTC 2023
+  setup: if UEFI is detected, mount efivarfs.
++--------------------------+
 Mon Mar 20 22:18:55 UTC 2023
   Keep efivarfs kernel module. Thanks to AlleyTrotter.
 +--------------------------+
diff --git a/source/installer/sources/initrd/usr/lib/setup/setup b/source/installer/sources/initrd/usr/lib/setup/setup
index 98984cd3a..94b8a41a1 100755
--- a/source/installer/sources/initrd/usr/lib/setup/setup
+++ b/source/installer/sources/initrd/usr/lib/setup/setup
@@ -61,6 +61,10 @@ To do this, you'll need to leave 'setup', and make the partitions using \
 information, read the 'setup' help file from the next menu." 10 64
 fi
 if [ -d /sys/firmware/efi ]; then
+  # First, let's make sure that efivarfs is active:
+  if [ "$(/bin/ls /sys/firmware/efi/efivars 2> /dev/null | wc -l)" = "0" ]; then
+    mount -t efivarfs none /sys/firmware/efi/efivars
+  fi
   if ! probe -l 2> /dev/null | grep "EFI System Partition" 1> /dev/null 2> /dev/null ; then
      dialog --title "NO EFI SYSTEM PARTITION DETECTED" \
  --msgbox "This machine appears to be using EFI/UEFI, but no EFI System \
diff --git a/source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.url b/source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.url
index b6bfa6361..1ae5a89a4 100644
--- a/source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.url
+++ b/source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.url
@@ -1 +1 @@
-http://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/1.6/xfce4-clipman-plugin-1.6.2.tar.bz2
+http://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/1.6/xfce4-clipman-plugin-1.6.3.tar.bz2