Poprawienie narzędzia immudex-distrobox-swap-root oraz dodanie narzędzia immudex...

diff --git a/addons/distrobox b/addons/distrobox
index a90885f40deb474a80341d816af8a4daf572ab4d..9bac39a4c854a12dd9ee8be9d16291dc1d85251c 100644 (file)
--- 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;