Compare commits

..

4 Commits

Author SHA1 Message Date
openoms
52bc1c9aa4 nodejs update to 22 2025-02-23 11:52:38 +01:00
cdemkos
cfded50575 replace amd with arm in ci/README.md (#4952) 2025-02-04 15:00:57 +01:00
frennkie
142b5197fb Switch to bitcoin user for version verification (#4942)
We normally run bitcoind as user bitcoin.
Running it here as root could potentially at some point cause issues (e.g. if files are created and the ownership is then off).
2025-02-03 14:12:41 +01:00
frennkie
76267f812b Update _background.sh (#4941)
Fix two typoe/switch characters in comments
2025-02-03 10:52:23 +01:00
6 changed files with 9 additions and 9 deletions

View File

@@ -76,9 +76,9 @@ jobs:
- name: Run the build script
run: |
echo "Using the variables: --pack fatpack --github_user ${{steps.set_values.outputs.GITHUB_USER}} --branch ${{env.BRANCH_NAME}} --preseed_file preseed.cfg --boot uefi --desktop none --image_size 31000"
echo "Using the variables: --pack fatpack --github_user ${{steps.set_values.outputs.GITHUB_USER}} --branch ${{env.BRANCH_NAME}} --preseed_file preseed.cfg --boot uefi --desktop none"
cd ci/amd64
bash packer.build.amd64-debian.sh --pack fatpack --github_user ${{steps.set_values.outputs.GITHUB_USER}} --branch ${{env.BRANCH_NAME}} --preseed_file preseed.cfg --boot uefi --desktop none --image_size 31000
bash packer.build.amd64-debian.sh --pack fatpack --github_user ${{steps.set_values.outputs.GITHUB_USER}} --branch ${{env.BRANCH_NAME}} --preseed_file preseed.cfg --boot uefi --desktop none
- name: Compute checksum of the raw image
run: |

View File

@@ -34,7 +34,7 @@
## Ready made images for arm64-rpi
* The images are built in GitHub actions
* To see the downloadable artifacts will need to log in to GitHub
* Find the latest successful build of the default amd64 image:
* Find the latest successful build of the default arm64 image:
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
```

View File

@@ -10,7 +10,7 @@ variable "boot" { default = "uefi" }
variable "preseed_file" { default = "preseed.cfg" }
variable "hostname" { default = "raspiblitz-amd64" }
variable "image_size" { default = "27000" }
variable "disk_size" { default = "27000" }
variable "memory" { default = "4096" }
variable "cpus" { default = "4" }
@@ -51,7 +51,7 @@ source "qemu" "debian" {
boot_command = local.boot_command
boot_wait = "5s"
cpus = var.cpus
disk_size = var.image_size
disk_size = var.disk_size
http_directory = "./http"
iso_checksum = var.iso_checksum
iso_url = "https://cdimage.debian.org/cdimage/release/current/amd64/iso-cd/${var.iso_name}"

View File

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

View File

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

View File

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