From 8840c0f5e3b38ec54909eb6f44be5ea0ace73784 Mon Sep 17 00:00:00 2001
From: TomasM <tomas@slax.org>
Date: Wed, 13 Dec 2017 07:04:54 -0500
Subject: [PATCH] mount guest dirs to /root/ so they are shared

---
 Slax/debian/modules/03-desktop/build          | 20 ++++---------------
 .../03-desktop/rootcopy/root/.fluxbox/startup |  9 +++++++--
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/Slax/debian/modules/03-desktop/build b/Slax/debian/modules/03-desktop/build
index feb3fa3..c6d3583 100755
--- a/Slax/debian/modules/03-desktop/build
+++ b/Slax/debian/modules/03-desktop/build
@@ -20,22 +20,10 @@ cd /
 unsquashfs /$NAME-stock.sb
 
 # create user directories
-mkdir -p /squashfs-root/home/guest/Desktop
-mkdir -p /squashfs-root/home/guest/Documents
-mkdir -p /squashfs-root/home/guest/Downloads
-mkdir -p /squashfs-root/home/guest/Music
-mkdir -p /squashfs-root/home/guest/Pictures
-mkdir -p /squashfs-root/home/guest/Public
-mkdir -p /squashfs-root/home/guest/Templates
-mkdir -p /squashfs-root/home/guest/Videos
-ln -s /home/guest/Desktop /squashfs-root/root/Desktop
-ln -s /home/guest/Documents /squashfs-root/root/Documents
-ln -s /home/guest/Downloads /squashfs-root/root/Downloads
-ln -s /home/guest/Music /squashfs-root/root/Music
-ln -s /home/guest/Pictures /squashfs-root/root/Pictures
-ln -s /home/guest/Public /squashfs-root/root/Public
-ln -s /home/guest/Templates /squashfs-root/root/Templates
-ln -s /home/guest/Videos /squashfs-root/root/Videos
+for dir in Desktop Documents Downloads Music Pictures Public Templates Videos; do
+   mkdir -p /squashfs-root/home/guest/$dir
+   mkdir -p /squashfs-root/root/$dir
+done
 chown -R guest.users /squashfs-root/home/guest
 
 # then, we want to patch it to implement window resizing!
diff --git a/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/startup b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/startup
index ad2291d..b8b8d46 100644
--- a/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/startup
+++ b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/startup
@@ -10,8 +10,13 @@ xmodmap "/root/.Xmodmap"
 # merge xresource settings
 xrdb -merge ~/.Xresources
 
-# Put some useful directories in users home dir
-xdg-user-dirs-update
+# Share common directories with guest user. This is necessary
+# because some apps like chromium must be running under guest
+for dir in Desktop Documents Downloads Music Pictures Public Templates Videos; do
+   if ! mountpoint /root/$dir; then
+      mount --bind /home/guest/$dir /root/$dir
+   fi
+done
 
 # set background color and big wait mouse cursor
 xsetroot -solid '#111111'