From ad92a71fad75ebce0429711201dee031e14de35f Mon Sep 17 00:00:00 2001
From: xf0r3m <jakubstasinski@protonmail.com>
Date: Sat, 16 Mar 2024 09:30:49 +0100
Subject: [PATCH] =?utf8?q?Utworzono=20addony=20dla=20distrobox=20oraz=20do?=
 =?utf8?q?ckera.=20Zmieniono=20addon=20kvm=20(ustawiono=20na=20sztywno,=20?=
 =?utf8?q?pierwszego=20(uid=3D1000)=20u=C5=BCytkownika).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 addons/distrobox | 15 +++++++++++++++
 addons/docker    | 24 ++++++++++++++++++++++++
 addons/kvm       |  5 ++---
 3 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 addons/distrobox
 create mode 100644 addons/docker

diff --git a/addons/distrobox b/addons/distrobox
new file mode 100644
index 0000000..a5750ad
--- /dev/null
+++ b/addons/distrobox
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+apt install -y distrobox;
+
+cat >> /usr/local/sbin/immudex-distrobox-swap-root << EOF
+#!/bin/bash
+
+if [ ! -d \${1}/containers ]; then
+	sudo cp -prvv /var/lib/containers \${1};
+fi
+
+sudo mount -B \${1}/containers /var/lib/containers;
+EOF
+chown root:root /usr/local/sbin/immudex-distrobox-swap-root;
+chmod 544 /usr/local/sbin/immudex-distrobox-swap-root;
diff --git a/addons/docker b/addons/docker
new file mode 100644
index 0000000..c901409
--- /dev/null
+++ b/addons/docker
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+apt install -y docker.io;
+u=$(grep '1000' /etc/password | cut -d ":" -f 1);
+usermod -aG docker $u;
+
+cat >> /usr/local/sbin/immudex-docker-swap-root << EOF
+#!/bin/bash
+sudo systemctl stop docker.socket
+sudo systemctl stop docker.service
+sudo systemctl stop containerd.service
+
+sudo sed -i "s,dockerd,dockerd --data-root=\${1}/docker," /lib/systemd/system/docker.service
+
+if [ ! -d \${1}/docker ]; then sudo cp -prvv /var/lib/docker \${1}; fi
+
+sudo systemctl daemon-reload
+
+sudo systemctl start containerd.service
+sudo systemctl start docker.socket
+sudo systemctl start docker.service
+EOF
+chown root:root /usr/local/bin/immudex-docker-swap-root;
+chmod 544 /usr/local/bin/immudex-docker-swap-root;
diff --git a/addons/kvm b/addons/kvm
index acd2ed7..4f9b529 100755
--- a/addons/kvm
+++ b/addons/kvm
@@ -2,6 +2,5 @@
 
 apt install -y qemu-kvm libvirt-clients libvirt-daemon-system bridge-utils virtinst libvirt-daemon virt-manager;
 
-for u in $(grep '100[0-9]' /etc/passwd | cut -d ":" -f 1 | awk '{printf $1" "}'); do
-	usermod -aG libvirt,libvirt-qemu $u;
-done
+u=$(grep '1000' /etc/passwd | cut -d ":" -f 1)
+usermod -aG libvirt,libvirt-qemu $u;
-- 
2.39.5