Update for Orange Pi 5 v1.0.2

This commit is contained in:
orangepi-xunlong
2022-12-05 14:37:48 +08:00
parent 35069ec81c
commit 69dd359f20
13 changed files with 109 additions and 55 deletions

View File

@@ -20,7 +20,7 @@ HOSTRELEASE=$(cat /etc/os-release | grep VERSION_CODENAME | cut -d"=" -f2)
[[ -z $HOSTRELEASE ]] && HOSTRELEASE=$(cut -d'/' -f1 /etc/debian_version)
[[ -z $EXIT_PATCHING_ERROR ]] && EXIT_PATCHING_ERROR="" # exit patching if failed
[[ -z $HOST ]] && HOST="$BOARD" # set hostname to the board
[[ -z $CHINA_DOWNLOAD_MIRROR ]] && CHINA_DOWNLOAD_MIRROR=tsinghua
[[ -z $CHINA_DOWNLOAD_MIRROR ]] && CHINA_DOWNLOAD_MIRROR=huawei
cd "${SRC}" || exit
[[ -z "${ROOTFSCACHE_VERSION}" ]] && ROOTFSCACHE_VERSION=11
[[ -z "${CHROOT_CACHE_VERSION}" ]] && CHROOT_CACHE_VERSION=7
@@ -583,7 +583,7 @@ if [[ $DOWNLOAD_MIRROR == "china" ]] ; then
UBUNTU_MIRROR='mirrors.tuna.tsinghua.edu.cn/ubuntu-ports/'
fi
if [[ ${CHINA_DOWNLOAD_MIRROR} == huawai ]]; then
if [[ ${CHINA_DOWNLOAD_MIRROR} == huawei ]]; then
DEBIAN_MIRROR='repo.huaweicloud.com/debian'
DEBIAN_SECURTY='repo.huaweicloud.com/debian-security'
UBUNTU_MIRROR='repo.huaweicloud.com/ubuntu-ports/'

View File

@@ -1816,8 +1816,10 @@ show_checklist_variables ()
install_docker() {
display_alert "Install Docker" "/etc/apt/sources.list.d/docker.list" "info"
chroot "${SDCARD}" /bin/bash -c "apt-get install -y -qq apt-transport-https ca-certificates curl gnupg lsb-release >/dev/null 2>&1"
[[ $install_docker != yes ]] && return
display_alert "Installing" "docker" "info"
chroot "${SDCARD}" /bin/bash -c "apt-get install -y -qq apt-transport-https ca-certificates curl gnupg2 software-properties-common >/dev/null 2>&1"
case ${RELEASE} in
buster|bullseye|bookworm)
@@ -1828,14 +1830,15 @@ install_docker() {
;;
esac
chroot "${SDCARD}" /bin/bash -c "curl -fsSL https://repo.huaweicloud.com/docker-ce/linux/${distributor_id}/gpg | sudo apt-key add -"
echo "deb [arch=${ARCH} signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://repo.huaweicloud.com/docker-ce/linux/${distributor_id} ${RELEASE} stable" > "${SDCARD}"/etc/apt/sources.list.d/docker.list
chroot "${SDCARD}" /bin/bash -c "curl -fsSL https://repo.huaweicloud.com/docker-ce/linux/${distributor_id}/gpg | apt-key add - > /dev/null 2>&1"
echo "deb [arch=${ARCH}] https://repo.huaweicloud.com/docker-ce/linux/${distributor_id} ${RELEASE} stable" > "${SDCARD}"/etc/apt/sources.list.d/docker.list
chroot "${SDCARD}" /bin/bash -c "apt-get update >/dev/null 2>&1"
chroot "${SDCARD}" /bin/bash -c "apt-get install -y -qq docker-ce docker-ce-cli containerd.io >/dev/null 2>&1"
chroot "${SDCARD}" /bin/bash -c "apt-get update > /dev/null 2>&1"
chroot "${SDCARD}" /bin/bash -c "apt-get install -y -qq docker-ce docker-ce-cli containerd.io > /dev/null 2>&1"
chroot "${SDCARD}" /bin/bash -c "sudo groupadd docker > /dev/null 2>&1"
chroot "${SDCARD}" /bin/bash -c "sudo usermod -aG docker ${OPI_USERNAME}"
run_on_sdcard "systemctl --no-reload disable docker.service >/dev/null 2>&1"
run_on_sdcard "systemctl --no-reload disable docker.service > /dev/null 2>&1"
}