From 30ab328780d5fe9fba1baf5178717f8a6d6725c0 Mon Sep 17 00:00:00 2001
From: lemniskett <lemniskett@outlook.com>
Date: Mon, 2 Nov 2020 19:36:27 +0700
Subject: [PATCH] More musl workarounds.

---
 exp/startx-killxdg.bash |  6 ++++++
 install.sh              |  4 ++++
 remount_run.bash        | 12 ++++++++++--
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100755 exp/startx-killxdg.bash

diff --git a/exp/startx-killxdg.bash b/exp/startx-killxdg.bash
new file mode 100755
index 0000000..28048fe
--- /dev/null
+++ b/exp/startx-killxdg.bash
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+source /etc/archbox.conf
+
+startx
+$PRIV /usr/local/share/archbox/bin/remount_run killxdg
diff --git a/install.sh b/install.sh
index 2f3a5f0..a264bda 100755
--- a/install.sh
+++ b/install.sh
@@ -7,3 +7,7 @@ install -v -D -m 755 ./copyresolv.bash /usr/local/share/archbox/bin/copyresolv
 install -v -D -m 755 ./archboxcommand.bash /usr/local/share/archbox/bin/archbox
 install -v -D -m 755 ./remount_run.bash /usr/local/share/archbox/bin/remount_run
 install -v -D -m 755 ./chroot_setup.bash /usr/local/share/archbox/chroot_setup.bash
+
+if [ $1 = "--exp" ]; then
+	install -v -D -m 755 ./exp/startx-killxdg.bash /usr/local/bin/startx-killxdg
+fi
diff --git a/remount_run.bash b/remount_run.bash
index d031444..a33709c 100755
--- a/remount_run.bash
+++ b/remount_run.bash
@@ -2,5 +2,13 @@
 
 source /etc/archbox.conf
 
-umount -l $CHROOT/run
-mount --rbind /run $CHROOT/run
+case $1 in 
+	killxdg)
+	umount -l $CHROOT/run
+	fuser -km $(cat /tmp/archbox_xdg_runtime_dir)
+	;;
+	*)
+        umount -l $CHROOT/run
+	mount --rbind /run $CHROOT/run
+	;;
+esac