brain-hackers_pepepper-mirror/brain-config
1
0
Fork 0
mirror of https://github.com/brain-hackers/brain-config.git synced 2025-10-30 03:58:39 +09:00
Code Issues Projects Releases Wiki Activity

Sync FKMS check with gldriver-test

Browse Source 
Fix is_pi check
This commit is contained in:
Serge Schneider
2020-02-26 17:52:43 +00:00
parent 7936440427
commit bcc4792e64
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@@ -1,3 +1,10 @@
raspi-config (20200226) buster; urgency=medium
* Sync FKMS check with gldriver-test
* Fix is_pi check
-- Serge Schneider <serge@raspberrypi.org> Wed, 26 Feb 2020 17:51:20 +0000
raspi-config (20200207) buster; urgency=medium raspi-config (20200207) buster; urgency=medium
* Fix bug preventing VNC from being disabled * Fix bug preventing VNC from being disabled

6
raspi-config
View File

@@ -12,7 +12,7 @@ USER=${SUDO_USER:-$(who -m | awk '{ print $1 }')}
is_pi () { is_pi () {
ARCH=$(dpkg --print-architecture) ARCH=$(dpkg --print-architecture)
if [ "$ARCH" = "armhf" ] ; then if [ "$ARCH" = "armhf" ] || [ "$ARCH" = "arm64" ] ; then
return 0 return 0
else else
return 1 return 1
@@ -74,7 +74,9 @@ is_ssh() {
} }
is_fkms() { is_fkms() {
if grep -q okay /proc/device-tree/soc/v3d@7ec00000/status 2> /dev/null || grep -q okay /proc/device-tree/soc/firmwarekms@7e600000/status 2> /dev/null ; then if grep -s -q okay /proc/device-tree/soc/v3d@7ec00000/status \
/proc/device-tree/soc/firmwarekms@7e600000/status \
/proc/device-tree/v3dbus/v3d@7ec04000/status; then
return 0 return 0
else else
return 1 return 1