Skip to content

Commit

Permalink
Merge pull request #937 from guydavis/develop
Browse files Browse the repository at this point in the history
Chia 2.1.1
  • Loading branch information
guydavis authored Oct 14, 2023
2 parents 8334459 + 8b50c13 commit a6683d7
Show file tree
Hide file tree
Showing 40 changed files with 112 additions and 115 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/develop-chia.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
"UBUNTU_VER=jammy"
"MACHINARIS_STREAM=develop"
"CHIADOG_BRANCH=dev"
"CHIA_BRANCH=release/2.1.0"
"CHIA_BRANCH=release/2.1.2"
"BLADEBIT_BRANCH=master"
"MADMAX_BRANCH=master"
"PLOTMAN_BRANCH=compress"
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
"MACHINARIS_STREAM=develop"
"CHIADOG_BRANCH=dev"
"GIGAHORSE_BRANCH=v1.8.2.giga14"
"CHIA_BRANCH=release/1.8.3"
"CHIA_BRANCH=main"
"MADMAX_BRANCH=v1.8.2.giga14"
"PLOTMAN_BRANCH=compress"
tags: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main-chia.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
build-args: |
"UBUNTU_VER=jammy"
"MACHINARIS_STREAM=latest"
"CHIA_BRANCH=release/2.1.0"
"CHIA_BRANCH=release/2.1.2"
"MADMAX_BRANCH=v1.8.2.giga14"
"BLADEBIT_BRANCH=master"
tags: |
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
"UBUNTU_VER=jammy"
"MACHINARIS_STREAM=latest"
"GIGAHORSE_BRANCH=v1.8.2.giga14"
"CHIA_BRANCH=release/1.8.1"
"CHIA_BRANCH=main"
"MADMAX_BRANCH=v1.8.2.giga14"
tags: |
${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-chia.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
"UBUNTU_VER=jammy"
"MACHINARIS_STREAM=test"
"CHIADOG_BRANCH=dev"
"CHIA_BRANCH=release/2.1.0"
"CHIA_BRANCH=release/2.1.2"
"PLOTMAN_BRANCH=development"
"BLADEBIT_BRANCH=master"
"MADMAX_BRANCH=v1.8.2.giga14"
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
"MACHINARIS_STREAM=test"
"CHIADOG_BRANCH=dev"
"GIGAHORSE_BRANCH=v1.8.2.giga14"
"CHIA_BRANCH=release/1.8.1"
"CHIA_BRANCH=main"
"PLOTMAN_BRANCH=development"
tags: |
${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:test
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased] - 2023-?-?
### Added
- Settings | Plotting | Bladebit now supports "no_direct_io: true" option
### Changed
### Updated

## [2.1.0] - 2023-10-06
### Updated
- [Bladebit](https://github.com/Chia-Network/bladebit/releases/tag/v3.1.0) to v3.1.0 - Supporting hybrid GPU/disk plotting with either 128 GB or 16 GB RAM.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.0
2.1.1
1 change: 1 addition & 0 deletions config/plotman.sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ plotting:
# BladeBit plotter; see https://github.com/guydavis/machinaris/wiki/Bladebit
threads: 4 # Threads per job
no_numa: true # Whether to disable NUMA memory support or not
no_direct_io: false # Whether to disable DirectIO writes to to destination media
compression: 0 # Compression level (default = 0, min = 0, max = 6)
mode: diskplot # Either enable ramplot, diskplot, or gpuplot.
diskplot_cache: 4GB # If diskplot, amount of RAM to allocate to caching disk writes
Expand Down
44 changes: 20 additions & 24 deletions scripts/bladebit_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,28 @@ BLADEBIT_BRANCH=$1 # Now ignored as install binaries from Github.
if [[ (${mode} =~ ^fullnode.* || ${mode} =~ "plotter") && (${blockchains} == 'chia') ]]; then
if [ ! -f /usr/bin/bladebit ] && [[ "${bladebit_skip_build}" != 'true' ]]; then
arch_name="$(uname -m)"
if [[ "${arch_name}" = "x86_64" ]] || [[ "${arch_name}" = "arm64" ]]; then
apt update && apt install -y build-essential cmake libgmp-dev libnuma-dev
cd /
apt update && apt install -y build-essential cmake libgmp-dev libnuma-dev
cd / && echo "Installing bladebit on ${arch_name}..."

# Now install CNI's separate binary for actual GPU plotting...
cd /opt/chia/bladebit
rm -f ./bladebit # Remove stale version bundled in the DEB package.
if [[ "${arch_name}" = "x86_64" ]]; then
curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0/bladebit-v3.1.0-ubuntu-x86-64.tar.gz
curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0/bladebit-cuda-v3.1.0-ubuntu-x86-64.tar.gz
else
curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0/bladebit-v3.1.0-ubuntu-arm64.tar.gz
curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0/bladebit-cuda-v3.1.0-ubuntu-arm64.tar.gz
fi
tar -xvf bladebit-v3.*.tar.gz
tar -xvf bladebit-cuda-v3.*.tar.gz
rm -f *tar.gz
chmod 755 bladebit*
chown root.root ./bladebit*

ln -s /opt/chia/bladebit/bladebit /usr/bin/bladebit
cd / && echo "Bladebit version: "`bladebit --version`
ln -s /opt/chia/bladebit/bladebit_cuda /usr/bin/bladebit_cuda
cd / && echo "Bladebit CUDA version: "`bladebit_cuda --version`
# Now install CNI's separate binary for actual GPU plotting...
cd /opt/chia/bladebit
rm -f ./bladebit # Remove stale version bundled in the DEB package.
if [[ "${arch_name}" = "x86_64" ]]; then
curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0/bladebit-v3.1.0-ubuntu-x86-64.tar.gz
curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0/bladebit-cuda-v3.1.0-ubuntu-x86-64.tar.gz
else
echo "Bladebit binary download skipped -> unsupported architecture: ${arch_name}"
curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0/bladebit-v3.1.0-ubuntu-arm64.tar.gz
curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0/bladebit-cuda-v3.1.0-ubuntu-arm64.tar.gz
fi
tar -xvf bladebit-v3.*.tar.gz
tar -xvf bladebit-cuda-v3.*.tar.gz
rm -f *tar.gz
chmod 755 bladebit*
chown root.root ./bladebit*

ln -s /opt/chia/bladebit/bladebit /usr/bin/bladebit
cd / && echo "Bladebit version: "`bladebit --version`
ln -s /opt/chia/bladebit/bladebit_cuda /usr/bin/bladebit_cuda
cd / && echo "Bladebit CUDA version: "`bladebit_cuda --version`
fi
fi
2 changes: 1 addition & 1 deletion scripts/config_api_server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if [ ! -f "${API_SETTINGS_FILE}" ]; then
arch_name="$(uname -m)"
echo "Configuring API server for arch_name=${arch_name}"
if [ "${mode}" == "fullnode" ]; then
if [ "${arch_name}" = "aarch64" ]; then
if [ "${arch_name}" != "x86_64" ]; then
echo "STATUS_EVERY_X_MINUTES = 4" > ${API_SETTINGS_FILE}
else
echo "STATUS_EVERY_X_MINUTES = 2" > ${API_SETTINGS_FILE}
Expand Down
4 changes: 2 additions & 2 deletions scripts/forks/apple_launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ for p in ${plots_dir//:/ }; do
done

chmod 755 -R /root/.apple/mainnet/config/ssl/ &> /dev/null
apple init --fix-ssl-permissions > /dev/null
apple init --fix-ssl-permissions >/dev/null 2>&1

# Start services based on mode selected. Default is 'fullnode'
if [[ ${mode} =~ ^fullnode.* ]]; then
Expand Down Expand Up @@ -101,7 +101,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then
if [[ -f /root/.apple/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then
apple init -c /root/.apple/farmer_ca 2>&1 > /root/.apple/mainnet/log/init.log
chmod 755 -R /root/.apple/mainnet/config/ssl/ &> /dev/null
apple init --fix-ssl-permissions > /dev/null
apple init --fix-ssl-permissions >/dev/null 2>&1
else
echo "Did not find your farmer's certificates within /root/.apple/farmer_ca."
echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester"
Expand Down
4 changes: 2 additions & 2 deletions scripts/forks/ballcoin_launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ for p in ${plots_dir//:/ }; do
done

chmod 755 -R /root/.ball/mainnet/config/ssl/ &> /dev/null
ball init --fix-ssl-permissions > /dev/null
ball init --fix-ssl-permissions >/dev/null 2>&1

# Start services based on mode selected. Default is 'fullnode'
if [[ ${mode} =~ ^fullnode.* ]]; then
Expand Down Expand Up @@ -103,7 +103,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then
if [[ -f /root/.ball/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then
ball init -c /root/.ball/farmer_ca 2>&1 > /root/.ball/mainnet/log/init.log
chmod 755 -R /root/.ball/mainnet/config/ssl/ &> /dev/null
ball init --fix-ssl-permissions > /dev/null
ball init --fix-ssl-permissions >/dev/null 2>&1
else
echo "Did not find your farmer's certificates within /root/.ball/farmer_ca."
echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester"
Expand Down
4 changes: 2 additions & 2 deletions scripts/forks/bpx_launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ for p in ${plots_dir//:/ }; do
done

chmod 755 -R /root/.bpx/mainnet/config/ssl/ &> /dev/null
bpx init --fix-ssl-permissions > /dev/null
bpx init --fix-ssl-permissions >/dev/null 2>&1

# Start services based on mode selected. Default is 'fullnode'
if [[ ${mode} =~ ^fullnode.* ]]; then
Expand Down Expand Up @@ -104,7 +104,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then
if [[ -f /root/.bpx/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then
bpx init -c /root/.bpx/farmer_ca 2>&1 > /root/.bpx/mainnet/log/init.log
chmod 755 -R /root/.bpx/mainnet/config/ssl/ &> /dev/null
bpx init --fix-ssl-permissions > /dev/null
bpx init --fix-ssl-permissions >/dev/null 2>&1
else
echo "Did not find your farmer's certificates within /root/.bpx/farmer_ca."
echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester"
Expand Down
4 changes: 2 additions & 2 deletions scripts/forks/btcgreen_launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ for p in ${plots_dir//:/ }; do
done

chmod 755 -R /root/.btcgreen/mainnet/config/ssl/ &> /dev/null
btcgreen init --fix-ssl-permissions > /dev/null
btcgreen init --fix-ssl-permissions >/dev/null 2>&1

# Start services based on mode selected. Default is 'fullnode'
if [[ ${mode} =~ ^fullnode.* ]]; then
Expand Down Expand Up @@ -106,7 +106,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then
if [[ -f /root/.btcgreen/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then
btcgreen init -c /root/.btcgreen/farmer_ca 2>&1 > /root/.btcgreen/mainnet/log/init.log
chmod 755 -R /root/.btcgreen/mainnet/config/ssl/ &> /dev/null
btcgreen init --fix-ssl-permissions > /dev/null
btcgreen init --fix-ssl-permissions >/dev/null 2>&1
else
echo "Did not find your farmer's certificates within /root/.btcgreen/farmer_ca."
echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester"
Expand Down
4 changes: 2 additions & 2 deletions scripts/forks/cactus_launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ for p in ${plots_dir//:/ }; do
done

chmod 755 -R /root/.cactus/mainnet/config/ssl/ &> /dev/null
cactus init --fix-ssl-permissions > /dev/null
cactus init --fix-ssl-permissions >/dev/null 2>&1

# Start services based on mode selected. Default is 'fullnode'
if [[ ${mode} =~ ^fullnode.* ]]; then
Expand Down Expand Up @@ -109,7 +109,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then
if [[ -f /root/.cactus/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then
cactus init -c /root/.cactus/farmer_ca 2>&1 > /root/.cactus/mainnet/log/init.log
chmod 755 -R /root/.cactus/mainnet/config/ssl/ &> /dev/null
cactus init --fix-ssl-permissions > /dev/null
cactus init --fix-ssl-permissions >/dev/null 2>&1
else
echo "Did not find your farmer's certificates within /root/.cactus/farmer_ca."
echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester"
Expand Down
8 changes: 3 additions & 5 deletions scripts/forks/chia_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,10 @@ else
echo "Installing Chia CUDA binaries on ${arch_name}..."
cd /tmp
if [[ "${arch_name}" = "x86_64" ]]; then
curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.0/chia-blockchain-cli_2.1.0-1_amd64.deb
apt-get install ./chia-blockchain-cli*.deb
elif [[ "${arch_name}" = "arm64" ]]; then
curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.0/chia-blockchain-cli_2.1.0-1_arm64.deb
curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.1/chia-blockchain-cli_2.1.1-1_amd64.deb
apt-get install ./chia-blockchain-cli*.deb
else
echo "Installing Chia CUDA binaries skipped -> unsupported architecture: ${arch_name}"
curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.1/chia-blockchain-cli_2.1.1-1_arm64.deb
apt-get install ./chia-blockchain-cli*.deb
fi
fi
4 changes: 2 additions & 2 deletions scripts/forks/chia_launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ for p in ${plots_dir//:/ }; do
done

chmod 755 -R /root/.chia/mainnet/config/ssl/ &> /dev/null
chia init --fix-ssl-permissions > /dev/null
chia init --fix-ssl-permissions >/dev/null 2>&1

/usr/bin/bash /machinaris/scripts/gpu_drivers_setup.sh

Expand Down Expand Up @@ -124,7 +124,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then
if [[ -f /root/.chia/farmer_ca/chia_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then
chia init -c /root/.chia/farmer_ca 2>&1 > /root/.chia/mainnet/log/init.log
chmod 755 -R /root/.chia/mainnet/config/ssl/ &> /dev/null
chia init --fix-ssl-permissions > /dev/null
chia init --fix-ssl-permissions >/dev/null 2>&1
else
echo "Did not find your farmer's certificates within /root/.chia/farmer_ca."
echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester"
Expand Down
4 changes: 2 additions & 2 deletions scripts/forks/chinilla_launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ for p in ${plots_dir//:/ }; do
done

chmod 755 -R /root/.chinilla/vanillanet/config/ssl/ &> /dev/null
chinilla init --fix-ssl-permissions > /dev/null
chinilla init --fix-ssl-permissions >/dev/null 2>&1

# Start services based on mode selected. Default is 'fullnode'
if [[ ${mode} =~ ^fullnode.* ]]; then
Expand Down Expand Up @@ -105,7 +105,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then
if [[ -f /root/.chinilla/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then
chinilla init -c /root/.chinilla/farmer_ca 2>&1 > /root/.chinilla/vanillanet/log/init.log
chmod 755 -R /root/.chinilla/vanillanet/config/ssl/ &> /dev/null
chinilla init --fix-ssl-permissions > /dev/null
chinilla init --fix-ssl-permissions >/dev/null 2>&1
else
echo "Did not find your farmer's certificates within /root/.chinilla/farmer_ca."
echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester"
Expand Down
4 changes: 2 additions & 2 deletions scripts/forks/coffee_launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ for p in ${plots_dir//:/ }; do
done

chmod 755 -R /root/.coffee/mainnet/config/ssl/ &> /dev/null
coffee init --fix-ssl-permissions > /dev/null
coffee init --fix-ssl-permissions >/dev/null 2>&1

# Start services based on mode selected. Default is 'fullnode'
if [[ ${mode} =~ ^fullnode.* ]]; then
Expand Down Expand Up @@ -101,7 +101,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then
if [[ -f /root/.coffee/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then
coffee init -c /root/.coffee/farmer_ca 2>&1 > /root/.coffee/mainnet/log/init.log
chmod 755 -R /root/.coffee/mainnet/config/ssl/ &> /dev/null
coffee init --fix-ssl-permissions > /dev/null
coffee init --fix-ssl-permissions >/dev/null 2>&1
else
echo "Did not find your farmer's certificates within /root/.coffee/farmer_ca."
echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester"
Expand Down
4 changes: 2 additions & 2 deletions scripts/forks/cryptodoge_launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ for p in ${plots_dir//:/ }; do
done

chmod 755 -R /root/.cryptodoge/mainnet/config/ssl/ &> /dev/null
cryptodoge init --fix-ssl-permissions > /dev/null
cryptodoge init --fix-ssl-permissions >/dev/null 2>&1

# Start services based on mode selected. Default is 'fullnode'
if [[ ${mode} =~ ^fullnode.* ]]; then
Expand Down Expand Up @@ -105,7 +105,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then
if [[ -f /root/.cryptodoge/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then
cryptodoge init -c /root/.cryptodoge/farmer_ca 2>&1 > /root/.cryptodoge/mainnet/log/init.log
chmod 755 -R /root/.cryptodoge/mainnet/config/ssl/ &> /dev/null
cryptodoge init --fix-ssl-permissions > /dev/null
cryptodoge init --fix-ssl-permissions >/dev/null 2>&1
else
echo "Did not find your farmer's certificates within /root/.cryptodoge/farmer_ca."
echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester"
Expand Down
4 changes: 2 additions & 2 deletions scripts/forks/ecostake_launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ for p in ${plots_dir//:/ }; do
done

chmod 755 -R /root/.ecostake/mainnet/config/ssl/ &> /dev/null
ecostake init --fix-ssl-permissions > /dev/null
ecostake init --fix-ssl-permissions >/dev/null 2>&1

# Start services based on mode selected. Default is 'fullnode'
if [[ ${mode} =~ ^fullnode.* ]]; then
Expand Down Expand Up @@ -101,7 +101,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then
if [[ -f /root/.ecostake/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then
ecostake init -c /root/.ecostake/farmer_ca 2>&1 > /root/.ecostake/mainnet/log/init.log
chmod 755 -R /root/.ecostake/mainnet/config/ssl/ &> /dev/null
ecostake init --fix-ssl-permissions > /dev/null
ecostake init --fix-ssl-permissions >/dev/null 2>&1
else
echo "Did not find your farmer's certificates within /root/.ecostake/farmer_ca."
echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester"
Expand Down
4 changes: 2 additions & 2 deletions scripts/forks/flax_launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ for p in ${plots_dir//:/ }; do
done

chmod 755 -R /root/.flax/mainnet/config/ssl/ &> /dev/null
flax init --fix-ssl-permissions > /dev/null
flax init --fix-ssl-permissions >/dev/null 2>&1

# Start services based on mode selected. Default is 'fullnode'
if [[ ${mode} =~ ^fullnode.* ]]; then
Expand Down Expand Up @@ -106,7 +106,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then
if [[ -f /root/.flax/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then
flax init -c /root/.flax/farmer_ca 2>&1 > /root/.flax/mainnet/log/init.log
chmod 755 -R /root/.flax/mainnet/config/ssl/ &> /dev/null
flax init --fix-ssl-permissions > /dev/null
flax init --fix-ssl-permissions >/dev/null 2>&1
else
echo "Did not find your farmer's certificates within /root/.flax/farmer_ca."
echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester"
Expand Down
4 changes: 2 additions & 2 deletions scripts/forks/flora_launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ for p in ${plots_dir//:/ }; do
done

chmod 755 -R /root/.flora/mainnet/config/ssl/ &> /dev/null
flora init --fix-ssl-permissions > /dev/null
flora init --fix-ssl-permissions >/dev/null 2>&1

# Start services based on mode selected. Default is 'fullnode'
if [[ ${mode} =~ ^fullnode.* ]]; then
Expand Down Expand Up @@ -107,7 +107,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then
if [[ -f /root/.flora/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then
flora init -c /root/.flora/farmer_ca 2>&1 > /root/.flora/mainnet/log/init.log
chmod 755 -R /root/.flora/mainnet/config/ssl/ &> /dev/null
flora init --fix-ssl-permissions > /dev/null
flora init --fix-ssl-permissions >/dev/null 2>&1
else
echo "Did not find your farmer's certificates within /root/.flora/farmer_ca."
echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester"
Expand Down
4 changes: 2 additions & 2 deletions scripts/forks/gigahorse_launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ for p in ${plots_dir//:/ }; do
done

chmod 755 -R /root/.chia/mainnet/config/ssl/ &> /dev/null
/chia-gigahorse-farmer/chia.bin init --fix-ssl-permissions > /dev/null
/chia-gigahorse-farmer/chia.bin init --fix-ssl-permissions >/dev/null 2>&1

/usr/bin/bash /machinaris/scripts/gpu_drivers_setup.sh

Expand Down Expand Up @@ -117,7 +117,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then
if [[ -f /root/.chia/farmer_ca/chia_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then
/chia-gigahorse-farmer/chia.bin init -c /root/.chia/farmer_ca 2>&1 > /root/.chia/mainnet/log/init.log
chmod 755 -R /root/.chia/mainnet/config/ssl/ &> /dev/null
/chia-gigahorse-farmer/chia.bin init --fix-ssl-permissions > /dev/null
/chia-gigahorse-farmer/chia.bin init --fix-ssl-permissions >/dev/null 2>&1
else
echo "Did not find your farmer's certificates within /root/.chia/farmer_ca."
echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester"
Expand Down
Loading

0 comments on commit a6683d7

Please sign in to comment.