qjyu
/
OrangePi_CM5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix OPI_USERNAME undefined issue in install_docker

This commit is contained in:
baiywt 2025-04-16 22:52:56 +08:00
parent ad7c5192c4
commit 2d0bfb96a0
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/distributions.sh
View File

@ -426,7 +426,7 @@ POST_INSTALL_KERNEL_DEBS
# add orangepi user # 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 "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" 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" chroot "${SDCARD}" /bin/bash -c "usermod -aG ${additionalgroup} ${OPI_USERNAME} 2>/dev/null"
done done

1
scripts/general.sh
View File

@ -1936,7 +1936,6 @@ install_docker() {
chroot "${SDCARD}" /bin/bash -c "apt-get update" 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 "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 groupadd docker"
chroot "${SDCARD}" /bin/bash -c "sudo usermod -aG docker ${OPI_USERNAME}"
run_on_sdcard "systemctl --no-reload disable docker.service" run_on_sdcard "systemctl --no-reload disable docker.service"
} }