From 2c05f239989f084b2f810f5c3702f17949456e86 Mon Sep 17 00:00:00 2001
From: lemniskett <lemniskett@outlook.com>
Date: Mon, 4 Jan 2021 11:38:20 +0700
Subject: [PATCH] Better mounting.

---
 archbox.conf     | 11 +++++++++
 archboxinit.bash | 61 +++++++++++++++++++++++++++++++-----------------
 2 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/archbox.conf b/archbox.conf
index 098fdab..2a4ece3 100644
--- a/archbox.conf
+++ b/archbox.conf
@@ -2,8 +2,19 @@ USER="lemniskett"
 PRIV="sudo"
 INSTALL_PATH="/var/archlinux"
 CHROOT="$INSTALL_PATH/root.x86_64"
+
+# Nix OS will breaks when you mount /run, change MOUNT_RUN to "no"
+# if you use Nix OS, don't forget to use `archbox --mount-runtime-only`
+# after user login
 MOUNT_RUN="yes"
 
+# Mount modules and boot directory, useful if you want to use kernels
+# from Arch Linux repo, otherwise it's best to remain disabled
+MOUNT_MOD="no"
+
+# Lazy unmounting, make sure you know what you're doing if enabling this!
+LAZY_UMOUNT="no"
+
 # Put your desired enviroment variable here, for example
 # ENV_VAR="HOME=/var/home/lemniskett"
 ENV_VAR=""
diff --git a/archboxinit.bash b/archboxinit.bash
index 05a3260..016da0a 100755
--- a/archboxinit.bash
+++ b/archboxinit.bash
@@ -2,34 +2,51 @@
 
 source /etc/archbox.conf
 
+msg(){
+    echo "$(tput bold)$(tput setaf 2)==> $@ $(tput sgr0)"
+}
+
+rbind() {
+    [[ $(mount | grep $CHROOT$1) ]] && msg "$CHROOT$1 already mounted." \
+        || (mount -R $1 $CHROOT$1 && msg "$CHROOT$1 mounted!")
+    [[ $2 = "make-rslave" ]] && mount --make-rslave $CHROOT$1
+}
+
+bindproc() {
+    [[ $(mount | grep $CHROOT/proc) ]] && msg "$CHROOT already mounted." \
+        || (mount -t proc /proc $CHROOT/proc && msg "$CHROOT/proc mounted!")
+}
+
+rmbind() {
+    umount_args=-R
+    [[ $LAZY_UMOUNT = "yes" ]] && umount_args=-Rl
+    [[ $(mount | grep $CHROOT$1) ]] && umount $umount_args $CHROOT$1 \
+        && msg "$CHROOT$1 unmounted!"
+}
+
 case $1 in
     start)
-        mount -R /home $CHROOT/home
-        mount -t proc /proc $CHROOT/proc
-        mount -R /tmp $CHROOT/tmp
-        mount -R /sys $CHROOT/sys
-        mount --make-rslave $CHROOT/sys
-        mount -R /dev $CHROOT/dev
-        mount --make-rslave $CHROOT/dev
-        [[ $MOUNT_RUN = "yes" ]] && mount -R /run $CHROOT/run
-        mount -R /lib/modules $CHROOT/lib/modules
-        mount -R /boot $CHROOT/boot
-        mount -R /var/lib/dbus $CHROOT/var/lib/dbus
-        mount -R / $CHROOT/var/host
+        rbind /home
+        bindproc
+        rbind /tmp
+        rbind /sys make-rslave
+        rbind /dev make-rslave
+        [[ $MOUNT_RUN = "yes" ]] && rbind /run
+        [[ $MOUNT_MOD = "yes" ]] && rbind /lib/modules && rbind /boot
+        [[ -d /var/lib/dbus ]] && rbind /var/lib/dbus
         chroot $CHROOT /usr/local/bin/serviced >/dev/null 2>&1
         exit 0
     ;;
     stop)
-        umount -R $CHROOT/home
-        umount -R $CHROOT/proc
-        umount -R $CHROOT/tmp
-        umount -R $CHROOT/sys
-        umount -R $CHROOT/dev
-        [[ $MOUNT_RUN = "yes" ]] && umount -R $CHROOT/run
-        umount -R $CHROOT/lib/modules
-        umount -R $CHROOT/boot
-        umount -R $CHROOT/var/lib/dbus
-        umount -R $CHROOT/var/host
+        rmbind /home
+        rmbind /proc
+        rmbind /tmp
+        rmbind /sys
+        rmbind /dev
+        [[ $MOUNT_RUN = "yes" ]] && rmbind /run
+        [[ $MOUNT_MOD = "yes" ]] && rmbind /lib/modules && rmbind /boot
+        rmbind /var/lib/dbus
+        kill $(pidof serviced) 2>/dev/null
         exit 0
     ;;
 esac