From bf1dda051aed09dee7442935280bd9bfb3e33805 Mon Sep 17 00:00:00 2001
From: xf0r3m <jakubstasinski@protonmail.com>
Date: Sat, 16 Mar 2024 15:45:48 +0100
Subject: [PATCH] =?utf8?q?Poprawienie=20narz=C4=99dzia=20immudex-distrobox?=
 =?utf8?q?-swap-root=20oraz=20dodanie=20narz=C4=99dzia=20immudex-distrobox?=
 =?utf8?q?-unlock-ds=20pozwalaj=C4=85cego=20na=20odblokownaie=20datastore-?=
 =?utf8?q?u=20(w=20celu=20zamkni=C4=99cia).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 addons/distrobox | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/addons/distrobox b/addons/distrobox
index a90885f..9bac39a 100644
--- a/addons/distrobox
+++ b/addons/distrobox
@@ -7,11 +7,34 @@ cat >> /usr/local/sbin/immudex-distrobox-swap-root << EOF
 
 if [ ! "\$1" ]; then echo "Target directory is required."; exit 1; fi
 
-if [ ! -d \${1}/containers ]; then
-	sudo cp -prvv /var/lib/containers \${1};
+if [ ! -d \${1}/distrobox ]; then
+	mkdir -p \${1}/distrobox/{var,run};
+	sudo cp -prvv /var/lib/containers \${1}/distrobox/var;
+	sudo cp -prvv /run/containers \${1}/distrobox/run;
 fi
 
-sudo mount -B \${1}/containers /var/lib/containers;
+sudo mount -B \${1}/distrobox/var/containers /var/lib/containers;
+sudo mount -B \${1}/distrobox/run/containers /run/containers;
 EOF
 chown root:root /usr/local/sbin/immudex-distrobox-swap-root;
 chmod 544 /usr/local/sbin/immudex-distrobox-swap-root;
+
+cat >> /usr/local/bin/immudex-distrobox-unlock-ds << EOF
+#!/bin/bash
+
+userCT=\$(distrobox-list | grep 'Up' | awk '{printf $3" "}');
+rootCT=\$(distrobox-list --root | grep 'Up' | awk '{printf $3" "}');
+
+if [ "\$userCT" ]; then distrobox-stop --all; fi
+
+if [ "\$rootCT" ]; then 
+	distrobox-stop --root --all;
+
+	sudo umount /var/lib/containers;
+	sudo umount /run/containers;
+fi
+
+catatonitPID=\$(pidof catatonit);
+if [ "\$catatonit" ]; then sudo kill \$(pidof catatonit); fi
+EOF
+chmod 755 /usr/local/bin/immudex-distrobox-unlock-ds;
-- 
2.39.5