Remove setup_secondary_mount knowledge from multinode-demo/ (#6530)
This commit is contained in:
parent
27f38a3770
commit
14eca5aea6
|
@ -54,8 +54,6 @@ if [[ -z $CI ]]; then # Skip in CI
|
||||||
source "$here"/../scripts/tune-system.sh
|
source "$here"/../scripts/tune-system.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
setup_secondary_mount
|
|
||||||
|
|
||||||
# These keypairs are created by ./setup.sh and included in the genesis block
|
# These keypairs are created by ./setup.sh and included in the genesis block
|
||||||
identity_keypair=$SOLANA_CONFIG_DIR/bootstrap-leader/identity-keypair.json
|
identity_keypair=$SOLANA_CONFIG_DIR/bootstrap-leader/identity-keypair.json
|
||||||
vote_keypair="$SOLANA_CONFIG_DIR"/bootstrap-leader/vote-keypair.json
|
vote_keypair="$SOLANA_CONFIG_DIR"/bootstrap-leader/vote-keypair.json
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
here=$(dirname "$0")
|
here=$(dirname "$0")
|
||||||
# shellcheck source=multinode-demo/common.sh
|
# shellcheck source=multinode-demo/common.sh
|
||||||
source "$here"/common.sh
|
source "$here"/common.sh
|
||||||
setup_secondary_mount
|
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
|
|
|
@ -185,8 +185,6 @@ if [[ -z "$ledger_dir" ]]; then
|
||||||
fi
|
fi
|
||||||
mkdir -p "$ledger_dir"
|
mkdir -p "$ledger_dir"
|
||||||
|
|
||||||
setup_secondary_mount
|
|
||||||
|
|
||||||
if [[ -n $gossip_entrypoint ]]; then
|
if [[ -n $gossip_entrypoint ]]; then
|
||||||
# Prefer the --entrypoint argument if supplied...
|
# Prefer the --entrypoint argument if supplied...
|
||||||
if [[ ${#positional_args[@]} -gt 0 ]]; then
|
if [[ ${#positional_args[@]} -gt 0 ]]; then
|
||||||
|
|
|
@ -100,7 +100,7 @@ SOLANA_CONFIG_DIR=$SOLANA_ROOT/config
|
||||||
clear_config_dir() {
|
clear_config_dir() {
|
||||||
declare config_dir="$1"
|
declare config_dir="$1"
|
||||||
|
|
||||||
setup_secondary_mount
|
_setup_secondary_mount
|
||||||
|
|
||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
|
@ -108,10 +108,12 @@ clear_config_dir() {
|
||||||
rm -rf "$config_dir"
|
rm -rf "$config_dir"
|
||||||
mkdir -p "$config_dir"
|
mkdir -p "$config_dir"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
_setup_secondary_mount
|
||||||
}
|
}
|
||||||
|
|
||||||
SECONDARY_DISK_MOUNT_POINT=/mnt/extra-disk
|
SECONDARY_DISK_MOUNT_POINT=/mnt/extra-disk
|
||||||
setup_secondary_mount() {
|
_setup_secondary_mount() {
|
||||||
# If there is a secondary disk, symlink the config/ dir there
|
# If there is a secondary disk, symlink the config/ dir there
|
||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
|
|
Loading…
Reference in New Issue