From 2d0bfb96a00936b3fc3d3afc538109f4b6589744 Mon Sep 17 00:00:00 2001 From: baiywt Date: Wed, 16 Apr 2025 22:52:56 +0800 Subject: [PATCH] Fix OPI_USERNAME undefined issue in install_docker --- scripts/distributions.sh | 2 +- scripts/general.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/distributions.sh b/scripts/distributions.sh index 5951ecb2a7ea..66d9b88d2555 100755 --- a/scripts/distributions.sh +++ b/scripts/distributions.sh @@ -426,7 +426,7 @@ POST_INSTALL_KERNEL_DEBS # add orangepi user chroot "${SDCARD}" /bin/bash -c "adduser --quiet --disabled-password --shell /bin/bash --home /home/${OPI_USERNAME} --gecos ${OPI_USERNAME} ${OPI_USERNAME}" chroot "${SDCARD}" /bin/bash -c "(echo ${OPI_PWD};echo ${OPI_PWD};) | passwd "${OPI_USERNAME}" >/dev/null 2>&1" - for additionalgroup in sudo netdev audio video disk tty users games dialout plugdev input bluetooth systemd-journal ssh; do + for additionalgroup in sudo netdev audio video disk tty users games dialout plugdev input bluetooth systemd-journal ssh docker; do chroot "${SDCARD}" /bin/bash -c "usermod -aG ${additionalgroup} ${OPI_USERNAME} 2>/dev/null" done diff --git a/scripts/general.sh b/scripts/general.sh index 7e8d10598920..964729f611bf 100755 --- a/scripts/general.sh +++ b/scripts/general.sh @@ -1936,7 +1936,6 @@ install_docker() { chroot "${SDCARD}" /bin/bash -c "apt-get update" chroot "${SDCARD}" /bin/bash -c "apt-get install -y -qq docker-ce docker-ce-cli containerd.io" chroot "${SDCARD}" /bin/bash -c "sudo groupadd docker" - chroot "${SDCARD}" /bin/bash -c "sudo usermod -aG docker ${OPI_USERNAME}" run_on_sdcard "systemctl --no-reload disable docker.service" }