README

@@ -43,10 +43,6 @@ Note:
   - it will create ISO and TAR files for you in /tmp
   - make sure you have enough free space in /tmp to handle it
 
-* If you want to use the Live Kit on a USB you have to either
-  - use Windows to execute the bootinst.bat file in the $NAME/boot folder
-  - or use Linux to execute the shellscript bootinst.sh in the $NAME/boot folder.
-
 * You will need the following packages to be installed:
   - squashfs-tools
   - genisoimage or mkisofs

Slax/briq/rootcopy/etc/issue

@@ -1,10 +0,0 @@
-\l
-                _              ____   _____ 
-               | |            / __ \\ / ____|
-             __| |_ __   __ _| |  | | (___  
-            / _` | '_ \\ / _` | |  | |\\___ \\ 
-           | (_| | | | | (_| | |__| |____) |
-            \\__,_|_| |_|\\__,_|\\____/|_____/ 
-
-                          powered by Briq
-

Slax/briq/rootcopy/usr/bin/dir2sb

@@ -1,58 +0,0 @@
-#!/bin/bash
-# Author: Tomas M. <http://www.slax.org/>
-
-usage()
-{
-   echo ""
-   echo "Convert directory to .sb compressed module"
-   echo "Usage: $0 [source_directory.sb] [[target_file.sb]]"
-   echo "  If source_directory does not have .sb suffix and it is not 'squashfs-root',"
-   echo "  then the source_directory itself is included in the module and"
-   echo "  then the target_file.sb parameter is required."
-   echo "  If target_file.sb is not specified, the source_directory is erased"
-   echo "  and replaced by the newly generated module file."
-}
-
-P1="$(readlink -f "$1")"
-P2="$(readlink -f "$2")"
-
-if [ "$P1" = "$P2" ]; then
-   P2=""
-fi
-
-SB=$(echo "$P1" | grep -o "[.]sb/*\$")
-if [ "$(echo "$P1" | grep -o "/squashfs-root/*\$")" != "" ]; then
-   SB="true"
-fi
-
-if [ "$SB" = "" ]; then
-   KEEP="-keep-as-directory"
-   if [ "$P2" = "" ]; then
-      usage
-      exit 1
-   fi
-else
-   KEEP=""
-fi
-
-if [ ! -d "$P1" ]; then
-   echo "Not a directory: $P1" >&2
-   exit 2
-fi
-
-
-if [ "$P2" = "" ]; then
-   TARGET="$P1".sb
-   while [ -e "$TARGET" ]; do TARGET="$TARGET"x; done
-   mksquashfs "$P1" "$TARGET" -comp xz -b 1024K -always-use-fragments $KEEP >/dev/null || exit 3
-   umount "$P1" 2>/dev/null
-   rm -Rf "$P1"
-   mv "$TARGET" "$P1"
-else
-   if [ -e "$P2" ]; then
-      echo "Target exists: $P2" >&2
-      exit 4
-   fi
-
-   mksquashfs "$P1" "$P2" -comp xz -b 1024K -always-use-fragments $KEEP >/dev/null
-fi

Slax/briq/rootcopy/usr/bin/pacman2sb

@@ -1,32 +0,0 @@
-#! /bin/bash --
-
-# Aggrega file di pacchetti installati o aggiornati con Pacman
-# dall'ultimo avvio di una distribuzione linux-live
-# (cfr. https://www.linux-live.org/ ) senza persistenza attivata,
-# creando un unico bundle .sb
-# I file vengono letti dalla directory changes e da essa filtrati solo
-# quelli appartenenti ai pacchetti di pacman.
-#
-# Autore: Guido Longoni <guidolongoni@gmail.com>
-
-IFS=$'\n'
-OUTLST="/tmp/added_files_$$.lst"
-CACHEDIR=$(sed -n -e '/^[[:space:]]*CacheDir/s|^[^=]*=[[:space:]]*||gp' -e 's|[[:space:]]*$||g' /etc/pacman.conf | head -n1)
-OUTDIR="/tmp/sb_$$"
-OUTFILE="$OUTDIR".sb
-CHGDIR=$(realpath $(mount | sed -n -e '/squashfs/s|.* on \([^ ]*\)/.*|\1|gp' | head -n1)/../changes)
-
-mkdir -p '/tmp'
-mkdir -p "$OUTDIR"
-rm -rf "$OUTLST"
-touch "$OUTLST"
-for i in $(find "$CACHEDIR" -iname '*.pkg.tar.xz'); do
-	tar t -f $i >> "$OUTLST" 2>/dev/null
-done
-sort -u "$OUTLST" | grep -v '^\.' > "$OUTLST".tmp
-mv "$OUTLST".tmp "$OUTLST"
-rsync -av --old-d --files-from="$OUTLST" "$CHGDIR" "$OUTDIR"
-dir2sb "$OUTDIR" "$OUTFILE"
-rm -rf "$OUTDIR"
-rm -rf "$OUTLST"
-

Slax/briq/rootcopy/usr/bin/pxe

@@ -1,86 +0,0 @@
-#!/bin/bash
-# Rebuild initial ramdisk with full network drivers,
-# start DHCP and TFTP server in order to provide PXE service
-#
-# Author: Tomas M <www.slax.org>
-
-LIVE=/run/initramfs
-FTPROOT=/var/state/dnsmasq/root
-
-# find out our own IP address. If more interfaces are available, use the first one
-IP="$(hostname -I | cut -d " " -f 1)"
-GW=$(ip route show | grep default | grep -o "via.*" | head -n 1 | cut -d " " -f 2)
-
-# if no IP is assigned to this computer, setup private address randomly
-if [ "$IP" = "" ]; then
-   killall dhclient 2>/dev/null
-   IP="10."$(($RANDOM/130+1))"."$(($RANDOM/130+1))".1"
-   ifconfig $(ls -1 /sys/class/net | egrep -v '^lo$' | sort | head -n 1) $IP netmask 255.255.255.0
-fi
-
-# if gateway is not recognized, lets make our IP a gateway and enable forwarding
-if [ "$GW" = "" ]; then
-   GW="$IP"
-   echo 1 > /proc/sys/net/ipv4/conf/all/forwarding
-   echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
-fi
-
-echo Starting PXE server on $IP ...
-
-# calculate C class range
-RANGE=$(echo $IP | cut -d "." -f 1-3)
-
-# make sure dnsmasq can be started
-killall dnsmasq 2>/dev/null
-killall busybox 2>/dev/null
-rm -Rf $FTPROOT 2>/dev/null
-mkdir -p $FTPROOT/{pxelinux.cfg,tmp}/
-
-# create root filesystem for ftfp
-cd $LIVE
-( find . -print | grep -v "memory"
-  cd /
-  find /lib/modules/$(uname -r)/kernel/drivers/net | grep -v wireless
-) | cpio -pvd $FTPROOT/tmp 2>/dev/null
-
-cp /lib/modules/$(uname -r)/modules.* $FTPROOT/tmp/lib/modules/$(uname -r)
-depmod -b $FTPROOT/tmp
-rm $FTPROOT/tmp/lib/initramfs_escaped
-
-# pack root in initramfs
-cd $FTPROOT/tmp
-find . -print | cpio -o -H newc 2>/dev/null | gzip -f --fast >../initrfs.img
-cd ..
-rm -Rf tmp
-
-# link files here since copying is not necessary
-ln -s $(find $LIVE/memory/{data,iso,toram} 2>/dev/null | grep vmlinuz | head -n 1) $FTPROOT/vmlinuz
-ln -s $(find $LIVE/memory/{data,iso,toram} 2>/dev/null | grep pxelinux.0 | head -n 1) $FTPROOT/pxelinux.0
-ln -s $(find $LIVE/memory/{data,iso,toram} 2>/dev/null | grep ldlinux.c32 | head -n 1) $FTPROOT/ldlinux.c32
-
-find $LIVE/memory/{data,iso,toram} 2>/dev/null | egrep "[.]sb\$" | sort -n | while read LINE; do
-   BAS="$(basename "$LINE")"
-   ln -s $LINE "$FTPROOT/$BAS"
-   echo $BAS >> "$FTPROOT/PXEFILELIST"
-done
-
-echo "This is <a href=http://www.slax.org/>Slax</a> PXE data server. PXE clients will download <a href=PXEFILELIST>file list</a>" > "$FTPROOT/index.html"
-
-# default pxelinux configuration. Keep xmode selection for clients the same like for the server
-echo "
-PROMPT 0
-DEFAULT slax
-LABEL slax
-KERNEL /vmlinuz
-IPAPPEND 1
-APPEND initrd=/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 $(cat /proc/cmdline | egrep -o 'slax.flags=[^ ]+' | sed -r 's:[,=]pxe::' | sed -r 's:[,=]toram::')
-" > $FTPROOT/pxelinux.cfg/default
-
-# start the DHCP server and TFTP server
-dnsmasq --enable-tftp --tftp-root=/var/state/dnsmasq/root \
---dhcp-boot=pxelinux.0,"$IP",$IP \
---dhcp-option=3,$GW \
---dhcp-range=$RANGE.2,$RANGE.250,infinite --log-dhcp
-
-# start HTTP server at port 7529 (that are the numbers you type on your phone to write 'slax')
-busybox httpd -p 7529 -h /var/state/dnsmasq/root

Slax/briq/rootcopy/usr/bin/rmsbdir

@@ -1,17 +0,0 @@
-#!/bin/bash
-# Author: Tomas M. <http://www.slax.org/>
-
-if [ ! -e "$1" ]; then
-   echo 
-   echo "Erase module directory created by sb2dir"
-   echo "Usage: $0 [source_directory.sb]"
-   exit 1
-fi
-
-if [ ! -d "$1" ]; then
-   echo "Directory does not exist: $1" >&2
-   exit
-fi
-
-umount "$1" 2>/dev/null
-rm -Rf "$1"

Slax/briq/rootcopy/usr/bin/sb

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-if [ "$1" = "rm" ]; then
-   shift
-   rmsbdir "$@"
-   exit $?
-fi 
-
-if [ "$1" = "rmdir" ]; then
-   shift
-   rmsbdir "$@"
-   exit $?
-fi 
-
-if [ "$1" = "conv" ]; then
-   shift
-fi
-
-if [ ! -r "$1" ]; then
-   echo File not found "$1"
-   exit 1
-fi
-
-if [ -d "$1" ]; then
-   dir2sb "$@"
-   exit $?
-fi
-
-sb2dir "$@"

Slax/briq/rootcopy/usr/bin/sb2dir

@@ -1,33 +0,0 @@
-#!/bin/bash
-# Author: Tomas M. <http://www.slax.org/>
-
-if [ ! -e "$1" ]; then
-   echo 
-   echo "Convert .sb compressed module into directory with the same name"
-   echo "Usage: $0 [source_file.sb] [[optional output_directory]]"
-   echo "  If the output_directory is specified, it must exist"
-   echo "  If the output_directory is not specified, the name source_file.sb"
-   echo "  is used and the directory is overmounted with tmpfs"
-   exit 1
-fi
-
-if [ ! -r "$1" ]; then
-   echo "File does not exist: $1" >&2
-   exit
-fi
-
-if [ "$2" = "" ]; then
-   SOURCE="$1".x
-   while [ -e "$SOURCE" ]; do SOURCE="$SOURCE"x; done
-   mv "$1" "$SOURCE" || exit
-   mkdir "$1"
-   mount -t tmpfs tmpfs "$1"
-   unsquashfs -f -dest "$1" "$SOURCE" >/dev/null || exit
-   rm "$SOURCE"
-else
-   if [ ! -d "$2" ]; then
-      echo "Directory does not exist: $2" >&2
-      exit
-   fi
-   unsquashfs -f -dest "$2" "$1" >/dev/null
-fi

Slax/debian/CHANGELOG

@@ -1,6 +1,3 @@
-For more updated changelog and todo, visit
-https://www.slax.org/next.php
-
 TODO:
 
    make persistent changes default when booting from writable media

Slax/debian/bootfiles/bootinst.sh

@@ -94,7 +94,7 @@ if [ "$(fdisk -l "$DEV" | fgrep "$DEV" | fgrep "*")" != "" ]; then
    echo ""
    echo "Partition $PART seems to be located on a physical disk,"
    echo "which is already bootable. If you continue, your drive $DEV"
-   echo "will boot only Slax by default."
+   echo "will boot only Linux by default."
    echo "Press [Enter] to continue, or [Ctrl+C] to abort..."
    read junk
 fi
@@ -107,16 +107,8 @@ if [ ! -x ./$EXTLINUX ]; then
    # extlinux is not executable. There are two possible reasons:
    # either the fs is mounted with noexec, or file perms are wrong.
    # Try to fix both, no fail on error yet
-   mount -o remount,exec $DEV
    chmod a+x ./$EXTLINUX
-fi
-
-if [ ! -x ./$EXTLINUX ]; then
-   # extlinux is still not executable. As a last try, copy it to .exe
-   # because the partition may be mounted with showexec option, from which
-   # we probably can't escape by remount
-   cp -f ./$EXTLINUX ./extlinux.exe
-   EXTLINUX=extlinux.exe
+   mount -o remount,exec $DEV
 fi
 
 # install syslinux bootloader

Slax/debian/bootfiles/syslinux.cfg

@@ -29,14 +29,15 @@ MENU TABMSG [F1] help                                                        [Ta
 LABEL default
 MENU LABEL Run Slax (Persistent changes)
 KERNEL /slax/boot/vmlinuz
-APPEND vga=normal initrd=/slax/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 slax.flags=perch,automount
+APPEND vga=normal initrd=/slax/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 slax.flags=perch,automount
 
 LABEL perch
 MENU LABEL Run Slax (Fresh start)
 KERNEL /slax/boot/vmlinuz
-APPEND vga=normal initrd=/slax/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 slax.flags=automount
+APPEND vga=normal initrd=/slax/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 slax.flags=automount
 
 LABEL toram
 MENU LABEL Run Slax (Copy to RAM)
 KERNEL /slax/boot/vmlinuz
-APPEND vga=normal initrd=/slax/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 slax.flags=toram
+APPEND vga=normal initrd=/slax/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 slax.flags=toram,automount
+

Slax/debian/cleanup

@@ -5,8 +5,6 @@ rm -f /etc/mtab
 rm -f /etc/apt/sources.list~
 rm -Rf /etc/systemd/system/timers.target.wants
 rm -f /etc/systemd/system/multi-user.target.wants/ssh.service
-rm -f /etc/systemd/system/multi-user.target.wants/dnsmasq.service
-
 rm -f /etc/ssh/ssh_host*
 
 rm -f /var/backups/*
@@ -50,6 +48,7 @@ rm -Rf /usr/share/icons/gnome/256x256
 rm /usr/share/applications/compton.desktop
 rm /usr/share/applications/debian-uxterm.desktop
 rm /usr/share/applications/debian-xterm.desktop
+rm /usr/share/applications/feh.desktop
 rm /usr/share/applications/htop.desktop
 rm /usr/share/applications/mc.desktop
 rm /usr/share/applications/mcedit.desktop

Slax/debian/install

@@ -6,13 +6,10 @@ apt-get dist-upgrade --yes
 # if kernel was upgraded, you may need to reboot
 apt-get install --yes --no-install-recommends mc squashfs-tools genisoimage zip unzip psmisc net-tools \
 alsa-utils man less xz-utils ca-certificates openssl acpid acpi-support-base powermgmt-base bzip2 gpart \
-hdparm sdparm mdadm smartmontools dosfstools lsof htop gddrescue rsync netcat ssh gpm wireless-tools \
-ntfs-3g rfkill file dnsmasq ntpdate dvd+rw-tools usb-modeswitch pm-utils
+hdparm sdparm mdadm smartmontools dosfstools lsof htop gddrescue rsync netcat ssh gpm wireless-tools
 
 ln -sf bash /bin/sh
 
-apt-get remove --yes vim* grub* debconf-i18n installation-report
-
 CWD="$(pwd)"
 cd /tmp
 apt-get download acpi-support

Slax/debian/modules/01-firmware/build

@@ -0,0 +1,12 @@
+
+apt-get update
+apt-get install --yes --no-install-recommends \
+   firmware-linux-free firmware-linux-nonfree \
+   firmware-atheros firmware-iwlwifi firmware-zd1211 firmware-realtek \
+   firmware-bnx2 firmware-brcm80211 firmware-cavium \
+   firmware-ipw2x00 firmware-libertas \
+   firmware-ti-connectivity
+
+. ../../cleanup
+
+savechanges /01-firmware.sb

Slax/debian/modules/02-xorg/build

@@ -1,22 +1,6 @@
-#!/bin/bash
 
 apt-get update
-apt-get install --yes --no-install-recommends \
-    xserver-xorg xserver-xorg-video-all xserver-xorg-video-intel \
-    xinit \
-    xterm \
-    blackbox \
-    libxcursor1 \
-    breeze-cursor-theme \
-    x11-utils \
-    wmctrl \
-    xdotool \
-    libdrm-intel1 \
-    libgl1-mesa-dri \
-    libglu1-mesa
-
-# Set setuid bit on xorg binary, so it can be started by guest user
-chmod u+s /usr/lib/xorg/Xorg
+apt-get install --yes --no-install-recommends xserver-xorg xinit xterm blackbox libxcursor1 breeze-cursor-theme x11-utils wmctrl xdotool
 
 # use only white cursors. There were some troubles if the other cursors
 # was left behind, installing gtk apps reverted the cursor from white to gray,
@@ -34,9 +18,6 @@ dpkg -x x11-xserver-utils*.deb /tmp/x11utils
 cd /tmp/x11utils
 cp -aR * /
 
-update-alternatives --set x-terminal-emulator /usr/bin/xterm
-
 . /tmp/cleanup
 
 savechanges /02-xorg.sb
-

Slax/debian/modules/02-xorg/rootcopy/lib/systemd/system/xorg.service

@@ -0,0 +1,6 @@
+[Unit]
+Description=X-Window
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=/bin/su --login -c /usr/bin/startx

Slax/debian/modules/02-xorg/rootcopy/root/.Xresources

@@ -26,5 +26,3 @@ Xft.hinting:    true
 Xft.hintstyle:  hintfull
 Xft.lcdfilter:  lcdlegacy
 Xft.rgba:       rgb
-
-XTerm*selectToClipboard: true

Slax/debian/modules/03-desktop/build

@@ -8,21 +8,11 @@ VERSION=1.3.5
 # first install stock version
 
 apt-get update
-apt-get install --no-install-recommends --yes \
-    $NAME \
-    feh \
-    compton \
-    volumeicon-alsa \
-    murrine-themes \
-    libnotify4 \
-    scrot
-
+apt-get install --no-install-recommends --yes $NAME feh compton volumeicon-alsa murrine-themes scrot
 . ../../cleanup
 
 (cd rootcopy && cp --parents -afr * /)
-chown guest.users /home/guest
 chown -R guest.users /home/guest/.gtkrc-2.0
-chown -R guest.users /home/guest/.config
 
 savechanges /$NAME-stock.sb
 
@@ -64,10 +54,10 @@ 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/v4.5.3.tar.gz
+wget -O /tmp/xlunch.tar.gz https://github.com/Tomas-M/xlunch/archive/v3.2.5.tar.gz
 cd /tmp
 tar -xf xlunch.tar.gz
-cd xlunch-4.5.3
+cd xlunch-3.2.5
 make
 cp xlunch /squashfs-root/usr/bin
 cp extra/gentriesquick /squashfs-root/usr/bin/xlunch_genquick
@@ -83,35 +73,4 @@ apt-get install --yes libgtk2.0-dev
 make
 cp systrayicon /squashfs-root/usr/bin
 
-
-# add gtkdialog
-wget -O /tmp/gtkdialog.tar.gz https://github.com/Tomas-M/GTKdialog/archive/master.tar.gz
-cd /tmp
-tar -xf gtkdialog.tar.gz
-cd GTKdialog-master
-make
-cp gtkdialog /squashfs-root/usr/bin
-
-
-# battery icon app
-cd /tmp
-wget https://github.com/valr/cbatticon/archive/1.6.7.tar.gz
-tar -xf 1.6.7.tar.gz
-cd cbatticon-1.6.7
-cp -R /usr/include/glib-2.0/* /usr/include
-cp -R /usr/include/gtk-2.0/* /usr/include
-apt install --yes libnotify-dev
-sed -i "s/WITH_GTK3 = 1/WITH_GTK3 = 0/" Makefile
-CFLAGS="-O2 \
--I/usr/lib/x86_64-linux-gnu/glib-2.0/include/ \
--I/usr/lib/x86_64-linux-gnu/gtk-2.0/include/ \
--I/usr/include/gdk-pixbuf-2.0/ \
--I/usr/include/atk-1.0/ \
--I/usr/include/cairo \
--I/usr/include/pango-1.0 \
--I/usr/include/glib-2.0 \
--I/usr/include/gtk-2.0" \
-make
-cp cbatticon /squashfs-root/usr/bin
-
 dir2sb /squashfs-root /03-desktop.sb

Slax/debian/modules/03-desktop/rootcopy/root/.config/volumeicon/volumeicon

@@ -8,9 +8,9 @@ onclick=xterm -e 'alsamixer'
 theme=White Gnome
 
 [Hotkeys]
-up_enabled=true
-down_enabled=true
-mute_enabled=true
+up_enabled=false
+down_enabled=false
+mute_enabled=false
 up=XF86AudioRaiseVolume
 down=XF86AudioLowerVolume
 mute=XF86AudioMute

Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/apps

@@ -3,11 +3,6 @@
   [Layer]	{2}
 [end]
 
-[app] (name=gtkdialog)
-  [Position]	(WINCENTER)	{0 0}
-  [Layer]	{2}
-[end]
-
 [app] (name=xlunch)
   [DECO]	{NONE}
   [IconHidden]	{yes}

Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/menu

@@ -1,10 +1,10 @@
 [begin] (Desktop menu)
    [exec] (Terminal) { fbstartupnotify && xterm -ls }
    [exec] (File Manager) { fbstartupnotify && pcmanfm }
-   [exec] (Web Browser) { fbstartupnotify && fbliveapp chromium }
+   [exec] (Web Browser) { fbstartupnotify && chromium }
    [exec] (Text Editor) { fbstartupnotify && leafpad }
    [exec] (Calculator) { fbstartupnotify && qalculate }
-   [exec] (Network Manager) { fbstartupnotify && wicd-manager }
+   [exec] (Network Manager) { fbstartupnotify && wicd-gtk --no-tray }
    [exec] (Run) { fbappselect }
    [separator]
    [workspaces] (Workspaces                ...)

Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/startup

@@ -13,8 +13,13 @@ xrdb -merge ~/.Xresources
 # set keyboard layout
 fbsetkb $(cat ~/.fluxbox/kblayout)
 
-# setup bookmarks for file manager
-gtk-bookmarks-update
+# setup bookmarks
+cat ~/.gtk-bookmarks | fgrep -v ///media/ | fgrep -v "file:/// /" | egrep -v '^$' > ~/.gtk-bookmarks.tmp 2>/dev/null
+ls -1 /media | while read LINE; do
+   echo "file:///media/$LINE $LINE" >> ~/.gtk-bookmarks.tmp
+done
+echo "file:/// /" >> ~/.gtk-bookmarks.tmp # add root
+mv -f ~/.gtk-bookmarks.tmp ~/.gtk-bookmarks
 
 # Share common directories with guest user. This is necessary
 # because some apps like chromium must be running under guest
@@ -28,10 +33,6 @@ done
 xsetroot -solid '#111111'
 xsetroot -xcf /usr/share/icons/breeze_cursors/cursors/watch 37
 
-# disable screen blanking
-xset s off
-xset -dpms
-
 # volume icon in system tray. Can fail if no soundcard is detected
 volumeicon &
 
@@ -72,12 +73,7 @@ rm -f $SIGNAL2 2>/dev/null
       sleep 0.1
    done
    touch $SIGNAL2
-
-   (sleep 1; (echo; sleep 10; echo :quit) | xlunch --window --xposition 20 --yposition -30 \
-   --width 195 --height 53 --noscroll --noprompt --backgroundcolor ffffff00 \
-   --multiple --desktop --button "/usr/share/fluxbox/styles/Slax/pixmaps/start-here.png;;0,0;fbappselect" & ) &
-
-   exec compton --sw-opti -e 0.9 --shadow-exclude 'class_g="xlunch-windowed"' --fade-exclude 'role*="fluxbox-toolbar"' --opacity-rule '70:role*="fluxbox-toolbar"' --no-fading-destroyed-argb -D 5 -c -f -l -2 -t -2 -r 0 -o 1 -z --shadow-exclude 'bounding_shaped'
+   exec compton --sw-opti -e 0.9 --fade-exclude 'role*="fluxbox-toolbar"' --opacity-rule '70:role*="fluxbox-toolbar"' --no-fading-destroyed-argb -D 5 -c -f -l -2 -t -2 -r 0 -o 1 -z --shadow-exclude 'bounding_shaped'
 ) &
 
 # We want to run systrayicon only after the volumeicon is started

Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbappselect

@@ -1,11 +1,11 @@
 #!/bin/bash
 
 COMMAND=$(
-  xlunch_genquick 64 --desktop | \
-  xlunch --border 7% --sideborder 10% --borderratio 100 --sideborderratio 50 \
+  xlunch_genquick 64 | \
+  xlunch --scroll \
          --background /usr/share/wallpapers/slax_wallpaper.jpg --font DejaVuSans/11 \
-         --voidclickterminate --iconpadding 40 --textpadding 10 \
-         --leastmargin 6 --hidemissing --iconsize 64 \
+         --voidclickterminate --iconpadding 30 --textpadding 10 \
+         --paddingswap --leastmargin 10 --hidemissing --iconsize 64 \
          --highlight /usr/share/icons/hicolor/128x128/apps/xlunch_highlight.png \
          --outputonly
 )
@@ -16,12 +16,6 @@ fi
 
 fbstartupnotify
 
-# if command is a .desktop file, parse it
-if [[ "$COMMAND" =~ \.desktop ]]; then
-   NoTerm="$(cat "$COMMAND" | grep Terminal\\s*= | grep -i "Terminal\\s*=\\s*false")"
-   COMMAND="$(cat "$COMMAND" | grep Exec\\s*= | head -n 1 | sed -r s/.*=// | sed -r "s/%[^%]+//g")"
-fi
-
 cmd="$(echo $COMMAND | sed -r "s/\\s.*//")"
 whi="$(which $cmd | head -n 1)"
 Xdep=$(ldd $whi | grep libX11)
@@ -32,7 +26,7 @@ if [ "$Ndep" != "" -o "$cmd" = "man" -o "$cmd" = "mc" ]; then
    WAIT=""
 fi
 
-if [ "$Xdep" = "" -a "$cmd" != "chromium" -a "$cmd" != "wicd-manager" -a "$cmd" != "fbliveapp" -a "$NoTerm" = "" ]; then
+if [ "$Xdep" = "" -a "$cmd" != "chromium" -a "$cmd" != "wicd-gtk" ]; then
    exec xterm -ls -e bash --login -c -- "echo $USER@$HOSTNAME:$PWD# '$COMMAND'; $COMMAND; $WAIT"
 else
    exec $COMMAND

Slax/debian/modules/03-desktop/rootcopy/usr/bin/fblogout

@@ -1,10 +1,10 @@
 #!/bin/bash
 
 COMMAND=$(
-     xlunch --input /etc/xlunch/logout.dsv --noprompt --border auto --sideborder auto --columns 3 --rows 1 \
+     xlunch --input /etc/xlunch/logout.dsv --noprompt --border auto --columns 3 --rows 1 \
             --background /usr/share/wallpapers/slax_wallpaper.jpg --font DejaVuSans/11 \
             --voidclickterminate --iconpadding 30 --textpadding 10 \
-            --leastmargin 10 --hidemissing --iconsize 128 \
+            --paddingswap --leastmargin 10 --hidemissing --iconsize 128 \
             --highlight /usr/share/icons/hicolor/128x128/apps/xlunch_highlight.png \
             --outputonly
 )

Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbscreensize

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+SIGNAL=~/.fehbg
+rm -f $SIGNAL
+
+OUTPUT=$(xrandr 2>/dev/null | grep 'connected' | cut -d " " -f 1)
+MODE=$1
+
+xrandr --output $OUTPUT --mode $MODE
+
+while [ -e $SIGNAL ]; do
+   sleep 0.1
+done
+
+killall -SIGUSR1 compton

Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/theme.cfg

@@ -4,7 +4,7 @@
 ! common settings
 *font: Bitstream Vera Sans-9
 
-background:             fullscreen
+background:             aspect
 background.pixmap:      /usr/share/wallpapers/slax_wallpaper.jpg
 
 toolbar.justify:                     left

Slax/debian/modules/04-apps/build

@@ -3,14 +3,7 @@
 CWD=$(dirname $(readlink -f $0))
 
 apt-get update
-apt-get install --no-install-recommends --yes \
-    leafpad \
-    qalculate-gtk \
-    pcmanfm \
-    lxtask \
-    xarchiver xdg-utils libgconf-2-4 \
-    wicd
-
+apt-get install --no-install-recommends --yes leafpad qalculate-gtk pcmanfm wicd
 . ../../cleanup
 
 (cd rootcopy && cp --parents -afr * /)
@@ -44,10 +37,4 @@ dpkg-buildpackage -us -uc
 strip --strip-unneeded src/pcmanfm
 cp src/pcmanfm /squashfs-root/usr/bin
 
-rm -f /squashfs-root/usr/share/applications/leafpad.desktop
-rm -f /squashfs-root/usr/share/applications/qalculate-gtk.desktop
-rm -f /squashfs-root/usr/share/applications/pcmanfm.desktop
-rm -f /squashfs-root/usr/share/applications/wicd.desktop
-rm -f /squashfs-root/usr/share/applications/lxtask.desktop
-
 dir2sb /squashfs-root /04-apps.sb