Compare commits

..

1 Commits

Author SHA1 Message Date
openoms
3f10c0facc check for physical rpi in bootstrap, only run uasp-fix on rpi 2025-01-18 09:04:11 +01:00
6 changed files with 23 additions and 14 deletions

View File

@@ -34,7 +34,7 @@
## Ready made images for arm64-rpi ## Ready made images for arm64-rpi
* The images are built in GitHub actions * The images are built in GitHub actions
* To see the downloadable artifacts will need to log in to GitHub * To see the downloadable artifacts will need to log in to GitHub
* Find the latest successful build of the default arm64 image: * Find the latest successful build of the default amd64 image:
https://github.com/raspiblitz/raspiblitz/actions/workflows/arm64-rpi-lean-image.yml?query=workflow%3Aarm64-rpi-lean-image-build+is%3Asuccess+branch%3Adev https://github.com/raspiblitz/raspiblitz/actions/workflows/arm64-rpi-lean-image.yml?query=workflow%3Aarm64-rpi-lean-image-build+is%3Asuccess+branch%3Adev
* unpack the artifact to the same directory * unpack the artifact to the same directory
``` ```

View File

@@ -1,5 +1,5 @@
variable "iso_name" { default = "debian-12.9.0-amd64-netinst.iso" } variable "iso_name" { default = "debian-12.8.0-amd64-netinst.iso" }
variable "iso_checksum" { default = "1257373c706d8c07e6917942736a865dfff557d21d76ea3040bb1039eb72a054" } variable "iso_checksum" { default = "04396d12b0f377958a070c38a923c227832fa3b3e18ddc013936ecf492e9fbb3" }
variable "pack" { default = "lean" } variable "pack" { default = "lean" }
variable "github_user" { default = "raspiblitz" } variable "github_user" { default = "raspiblitz" }

View File

@@ -721,7 +721,7 @@ do
fi fi
############################### ###############################
# RAID data check (BTRFS) # RAID data check (BRTFS)
############################### ###############################
# see https://github.com/rootzoll/raspiblitz/issues/360#issuecomment-467698260 # see https://github.com/rootzoll/raspiblitz/issues/360#issuecomment-467698260
@@ -729,7 +729,7 @@ do
recheckRAID=$((($counter % 3600)+1)) recheckRAID=$((($counter % 3600)+1))
if [ ${recheckRAID} -eq 1 ]; then if [ ${recheckRAID} -eq 1 ]; then
# check if BTRFS raid is active & scrub # check if BTRTFS raid is active & scrub
logger -p info "background.sh - RAID data check" logger -p info "background.sh - RAID data check"
source <(/home/admin/config.scripts/blitz.datadrive.sh status) source <(/home/admin/config.scripts/blitz.datadrive.sh status)
if [ "${isBTRFS}" == "1" ] && [ "${isRaid}" == "1" ]; then if [ "${isBTRFS}" == "1" ] && [ "${isRaid}" == "1" ]; then

View File

@@ -81,6 +81,12 @@ ln_cl_mainnet_sync_initial_done=0
ln_cl_testnet_sync_initial_done=0 ln_cl_testnet_sync_initial_done=0
ln_cl_signet_sync_initial_done=0 ln_cl_signet_sync_initial_done=0
# detect physical Raspberry Pi
rpi=0
if grep -q "Raspberry Pi" /proc/device-tree/model 2>/dev/null; then
rpi=1
fi
# detect VM # detect VM
vm=0 vm=0
if [ $(systemd-detect-virt) != "none" ]; then if [ $(systemd-detect-virt) != "none" ]; then
@@ -97,6 +103,7 @@ echo "setupPhase=${setupPhase}" >> $infoFile
echo "setupStep=${setupStep}" >> $infoFile echo "setupStep=${setupStep}" >> $infoFile
echo "baseimage=${baseimage}" >> $infoFile echo "baseimage=${baseimage}" >> $infoFile
echo "cpu=${cpu}" >> $infoFile echo "cpu=${cpu}" >> $infoFile
echo "rpi=${rpi}" >> $infoFile
echo "vm=${vm}" >> $infoFile echo "vm=${vm}" >> $infoFile
echo "blitzapi=${blitzapi}" >> $infoFile echo "blitzapi=${blitzapi}" >> $infoFile
echo "displayClass=${displayClass}" >> $infoFile echo "displayClass=${displayClass}" >> $infoFile
@@ -489,13 +496,15 @@ fi
################################ ################################
# UASP FIX # UASP FIX
################################ ################################
/home/admin/_cache.sh set message "checking HDD" if [ "${rpi}" == "1" ] ; then
source <(/home/admin/config.scripts/blitz.datadrive.sh uasp-fix) /home/admin/_cache.sh set message "checking HDD"
if [ "${neededReboot}" == "1" ]; then source <(/home/admin/config.scripts/blitz.datadrive.sh uasp-fix)
echo "UASP FIX applied ... reboot needed." >> $logFile if [ "${neededReboot}" == "1" ]; then
systemInitReboot=1 echo "UASP FIX applied ... reboot needed." >> $logFile
else systemInitReboot=1
echo "No UASP FIX needed" >> $logFile else
echo "No UASP FIX needed" >> $logFile
fi
fi fi
###################################### ######################################

View File

@@ -288,7 +288,7 @@ if [ "${mode}" = "tested" ] || [ "${mode}" = "reckless" ] || [ "${mode}" = "cust
tar -xvf ${binaryName} tar -xvf ${binaryName}
sudo install -m 0755 -o root -g root -t /usr/local/bin/ bitcoin-${bitcoinVersion}/bin/* sudo install -m 0755 -o root -g root -t /usr/local/bin/ bitcoin-${bitcoinVersion}/bin/*
sleep 3 sleep 3
if ! sudo -u bitcoin /usr/local/bin/bitcoind --version | grep "${bitcoinVersion}"; then if ! sudo /usr/local/bin/bitcoind --version | grep "${bitcoinVersion}"; then
echo echo
echo "# BUILD FAILED --> Was not able to install bitcoind version(${bitcoinVersion})" echo "# BUILD FAILED --> Was not able to install bitcoind version(${bitcoinVersion})"
exit 1 exit 1

View File

@@ -2,7 +2,7 @@
# follows https://github.com/nodesource/distributions/blob/master/README.md#manual-installation # follows https://github.com/nodesource/distributions/blob/master/README.md#manual-installation
VERSION="22" VERSION="20"
# command info # command info
if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then