| @@ -116,6 +116,8 if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then | |||||
| 116 | # Install tools |
|
116 | # Install tools | |
| 117 | install_readonly "${R}/tmp/pi-bluetooth/usr/bin/btuart" "${R}/usr/bin/btuart" |
|
117 | install_readonly "${R}/tmp/pi-bluetooth/usr/bin/btuart" "${R}/usr/bin/btuart" | |
| 118 | install_readonly "${R}/tmp/pi-bluetooth/usr/bin/bthelper" "${R}/usr/bin/bthelper" |
|
118 | install_readonly "${R}/tmp/pi-bluetooth/usr/bin/bthelper" "${R}/usr/bin/bthelper" | |
|
|
119 | ||||
|
|
120 | # make scripts executable | |||
| 119 | chmod +x "${R}/usr/bin/bthelper" |
|
121 | chmod +x "${R}/usr/bin/bthelper" | |
| 120 | chmod +x "${R}/usr/bin/btuart" |
|
122 | chmod +x "${R}/usr/bin/btuart" | |
| 121 |
|
123 | |||
| @@ -340,7 +340,7 esac | |||||
| 340 | # Raspberry PI 0,3,3P with Bluetooth and Wifi onboard |
|
340 | # Raspberry PI 0,3,3P with Bluetooth and Wifi onboard | |
| 341 | if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then |
|
341 | if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then | |
| 342 | # Include bluetooth packages on supported boards |
|
342 | # Include bluetooth packages on supported boards | |
| 343 |
if [ "$ENABLE_BLUETOOTH" = true ] |
|
343 | if [ "$ENABLE_BLUETOOTH" = true ] ; then | |
| 344 | APT_INCLUDES="${APT_INCLUDES},bluetooth,bluez" |
|
344 | APT_INCLUDES="${APT_INCLUDES},bluetooth,bluez" | |
| 345 | fi |
|
345 | fi | |
| 346 | else # Raspberry PI 1,1P,2 without Wifi and bluetooth onboard |
|
346 | else # Raspberry PI 1,1P,2 without Wifi and bluetooth onboard | |
| @@ -426,14 +426,6 else | |||||
| 426 | fi |
|
426 | fi | |
| 427 | fi |
|
427 | fi | |
| 428 |
|
428 | |||
| 429 | if [ "$ENABLE_BLUETOOTH" = true ] ; then |
|
|||
| 430 | if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then |
|
|||
| 431 | if [ "$ENABLE_CONSOLE" = false ] ; then |
|
|||
| 432 | APT_INCLUDES="${APT_INCLUDES},bluetooth,bluez" |
|
|||
| 433 | fi |
|
|||
| 434 | fi |
|
|||
| 435 | fi |
|
|||
| 436 |
|
||||
| 437 | # Check if root SSH (v2) public key file exists |
|
429 | # Check if root SSH (v2) public key file exists | |
| 438 | if [ -n "$SSH_ROOT_PUB_KEY" ] ; then |
|
430 | if [ -n "$SSH_ROOT_PUB_KEY" ] ; then | |
| 439 | if [ ! -f "$SSH_ROOT_PUB_KEY" ] ; then |
|
431 | if [ ! -f "$SSH_ROOT_PUB_KEY" ] ; then | |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant
