adafruit-mirror/Raspberry-Pi-Installer-Scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #338 from mikeysklar/bootdir-configtxt

Browse source 
adafruit-pitft.py boot_dir
This commit is contained in:
Limor "Ladyada" Fried 2025-03-10 10:35:21 -04:00 committed by GitHub
commit d7109fa827
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
adafruit-pitft.py
View file

@ -743,8 +743,14 @@ user_homedir = os.path.expanduser(f"~{username}")
if shell.isdir(user_homedir):
target_homedir = user_homedir
boot_dir = shell.get_boot_config()
if boot_dir is None:
boot_dir = "/boot/firmware" if shell.isdir("/boot/firmware") else "/boot"
# If neither directory is valid, use shell.get_boot_config()
if not shell.isdir(boot_dir):
boot_dir = shell.get_boot_config()
# Final safeguard: Ensure boot_dir is actually a directory and not a file path
if boot_dir is None or not shell.isdir(boot_dir):
shell.bail("Unable to find boot directory")
if shell.get_raspbian_version() == "bullseye":