From fe97857c62b9aad604ac639f2f964e44d297534d Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Wed, 8 Aug 2018 08:09:44 -0700
Subject: [PATCH] Add 'setup-args' snap configuration parameter, to override -p

---
 snap/hooks/configure | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/snap/hooks/configure b/snap/hooks/configure
index 03cf9ee8d5..59135c9445 100755
--- a/snap/hooks/configure
+++ b/snap/hooks/configure
@@ -11,21 +11,23 @@ if [[ -z "$mode" ]]; then
   exit 0
 fi
 
-ip_address_arg=-p # Use public IP address (TODO: make this configurable?)
 num_tokens="$(snapctl get num-tokens)"
+num_tokens="${num_tokens:+-n $num_tokens}"
+
+setup_args="$(snapctl get setup-args)"
 
 case $mode in
 leader+drone)
-  "$SNAP"/bin/setup.sh ${num_tokens:+-n $num_tokens} ${ip_address_arg} -t leader
+  "$SNAP"/bin/setup.sh -t leader $num_tokens -p $setup_args
   snapctl start --enable solana.daemon-drone
   snapctl start --enable solana.daemon-leader
   ;;
 leader)
-  "$SNAP"/bin/setup.sh ${num_tokens:+-n "$num_tokens"} ${ip_address_arg} -t leader
+  "$SNAP"/bin/setup.sh -t leader $num_tokens -p $setup_args
   snapctl start --enable solana.daemon-leader
   ;;
 validator)
-  "$SNAP"/bin/setup.sh ${ip_address_arg} -t validator
+  "$SNAP"/bin/setup.sh -t validator -p $setup_args
   snapctl start --enable solana.daemon-validator
   ;;
 *)