Utworzono addony dla distrobox oraz dockera. Zmieniono addon kvm (ustawiono na sztywn...

diff --git a/addons/distrobox b/addons/distrobox
new file mode 100644 (file)
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 (file)
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 acd2ed7b3d0b735f4c050d8ff4a6950d8d3e5412..4f9b529381a2b04cd7c3a4e9564e09d25f0f595b 100755 (executable)
--- 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;