From b7920dc2f4e36e8f33082a47caedf78c8ffd14dd Mon Sep 17 00:00:00 2001 From: Tulip Blossom Date: Wed, 8 Jan 2025 22:20:35 -0300 Subject: [PATCH] fix: just add docker instead --- build_scripts/25-dx.sh | 7 ++----- .../usr/share/ublue-os/privileged-setup.hooks.d/20-dx.sh | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/build_scripts/25-dx.sh b/build_scripts/25-dx.sh index 58f9c78..f1ae85f 100755 --- a/build_scripts/25-dx.sh +++ b/build_scripts/25-dx.sh @@ -18,9 +18,6 @@ dnf -y --enablerepo docker-ce-stable install \ docker-ce-cli \ containerd.io \ docker-buildx-plugin \ - docker-compose-plugin && \ - systemctl enable docker + docker-compose-plugin - -dnf -y group install "Virtualization Hypervisor" -dnf -y group install "Virtualization Tools" +systemctl enable docker diff --git a/system_files/usr/share/ublue-os/privileged-setup.hooks.d/20-dx.sh b/system_files/usr/share/ublue-os/privileged-setup.hooks.d/20-dx.sh index cce0838..87c2c23 100644 --- a/system_files/usr/share/ublue-os/privileged-setup.hooks.d/20-dx.sh +++ b/system_files/usr/share/ublue-os/privileged-setup.hooks.d/20-dx.sh @@ -11,15 +11,15 @@ append_group() { # Setup Groups append_group docker -append_group libvirt # We dont have incus on the image yet # append_group incus-admin +# append_group libvirt +# usermod -aG libvirt $user # usermod -aG incus-admin $user wheelarray=($(getent group wheel | cut -d ":" -f 4 | tr ',' '\n')) for user in $wheelarray do usermod -aG docker $user - usermod -aG libvirt $user done