Skip to content

Commit

Permalink
Merge pull request #1599 from pi-hole/tweak/386-workaround
Browse files Browse the repository at this point in the history
[v5] Fix architecture detection for linux/386 images
  • Loading branch information
PromoFaux authored Jun 15, 2024
2 parents b799ee3 + eda9fdc commit f60e958
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions src/s6/debian-root/usr/local/bin/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,15 @@ detect_arch() {
S6_ARCH="armhf";;
armv7l)
S6_ARCH="armhf";;
i386)
S6_ARCH="i686";;
esac
x86_64)
# arch returns x86_64 on linux/i386, causing the wrong s6-overlay to be downloaded
# fallback to dpkg to check the architecture and download the i686 s6-overlay if necessary
# see https://github.com/pi-hole/docker-pi-hole/issues/1524 for more information
ARCH_CHECK=$(dpkg --print-architecture)
if [ "$ARCH_CHECK" == "i386" ]; then
S6_ARCH="i686"
fi
esac
}


Expand Down

0 comments on commit f60e958

Please sign in to comment.