From cb0039761a4a2fa231f5f2b5f1ebe3b729350e53 Mon Sep 17 00:00:00 2001
From: TomasM <tomas@slax.org>
Date: Fri, 15 Dec 2017 05:46:39 -0500
Subject: [PATCH] skip squashfs filesystems in media, update xlunch

---
 Slax/debian/modules/03-desktop/build                        | 5 +++--
 Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbappselect | 2 +-
 livekitlib                                                  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Slax/debian/modules/03-desktop/build b/Slax/debian/modules/03-desktop/build
index c6d3583..b818b31 100755
--- a/Slax/debian/modules/03-desktop/build
+++ b/Slax/debian/modules/03-desktop/build
@@ -54,12 +54,13 @@ cp debian/$NAME/usr/bin/fluxbox /squashfs-root/usr/bin
 
 
 # add xlunch from sources
-wget -O /tmp/xlunch.tar.gz https://github.com/Tomas-M/xlunch/archive/v3.1.3.tar.gz
+wget -O /tmp/xlunch.tar.gz https://github.com/Tomas-M/xlunch/archive/v3.2.4.tar.gz
 cd /tmp
 tar -xf xlunch.tar.gz
-cd xlunch-3.1.3
+cd xlunch-3.2.4
 make
 cp xlunch /squashfs-root/usr/bin
+cp extra/gentriesquick /squashfs-root/usr/bin/xlunch_genquick
 mkdir -p /squashfs-root/usr/share/icons/hicolor/48x48/apps/
 cp extra/ghost.png /squashfs-root/usr/share/icons/hicolor/48x48/apps/xlunch_ghost.png
 
diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbappselect b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbappselect
index 6e4238c..04c33b4 100755
--- a/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbappselect
+++ b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbappselect
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 COMMAND=$(
-  xlunch --input /etc/xlunch/entries.dsv \
+  xlunch --input /etc/xlunch/entries.dsv --scroll \
          --background /usr/share/wallpapers/slax_wallpaper.jpg --font DejaVuSans/11 \
          --voidclickterminate --iconpadding 30 --textpadding 10 \
          --paddingswap --leastmargin 10 --hidemissing --iconsize 128 \
diff --git a/livekitlib b/livekitlib
index e405d02..02e2aac 100644
--- a/livekitlib
+++ b/livekitlib
@@ -804,7 +804,7 @@ fstab_create()
       FS="$(device_tag $DEVICE TYPE)"
       LABEL="$(device_tag $DEVICE LABEL | sed -r "s:[/ ]:_:g")"
       if [ "$LABEL" = "" ]; then LABEL="$(basename $DEVICE)"; fi
-      if [ "$FS" != "swap" ]; then
+      if [ "$FS" != "swap" -a "$FS" != "squashfs" ]; then
          mkdir -p "$1/media/$LABEL"
          echo "$DEVICE" "/media/$LABEL" $FS defaults,noatime 0 0 >> $FSTAB
       fi