Install 32bit FTL on 32bit OS (even if 64bit architecture is detected) #2004
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… If so, download the 32bit binary as we cannot expect the 64bit libraries to be present. Signed-off-by: DL6ER <dl6er@dl6er.de>
DL6ER
changed the title
dschaper
added
PR: Code Review Required
|
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: |
DL6ER
requested review from
PromoFaux,
dschaper,
WaLLy3K,
jacobsalmela and
AzureMarker
and removed request for
a team
AzureMarker
reviewed
May 31, 2018
advanced/Scripts/piholeCheckout.sh
Outdated
| local machine | ||
| machine=$(uname -m) | ||
|
|
||
| # This gives the architecture of packages dpkg installs (for example, "i386") | ||
| local dpkgarch | ||
| dpkgarch=$(dpkg --print-architecture 2> /dev/null) |
There was a problem hiding this comment.
On fedora, is it ok that dpkg will not exist?
There was a problem hiding this comment.
dpkg won't be there, but file will be:
file $(whereis file) | grep -v "64-bit" | grep "32-bit" &> /dev/null
if [ "$?" = 0 ]; then
machine="i686"
fi
Which would technically work in both debian and fedora universes. But I'd only use it if 1] dpkg wasn't available, and 2] the architecture was identifying as x86_64 via uname -m.
AzureMarker
previously approved these changes
Jun 9, 2018
AzureMarker
approved these changes
Jun 9, 2018
|
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: |
|
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
By submitting this pull request, I confirm the following:
please fill any appropriate checkboxes, e.g: [X]
git rebase)Please make sure you Sign Off all commits. Pi-hole enforces the DCO.
What does this PR aim to accomplish?:
Try to determine if the user is running a 32bit OS on a 64bit system. If so, download the 32bit binary as we cannot expect the 64bit libraries to be present.
Should fix #1998 and many others + some issues we saw on Discourse.
How does this PR accomplish the above?:
Try to detect architecture
dpkguses to install packages. This will only work on Debian-based systems, but not on Fedora, etc.Unfortunately, I cannot really test this at the moment as droplets with 32bit OS return
(which already leads to downloading the 32 bit library)