Skip to content

Commit 1543fe0

Browse files
committed
move iinit-as-rods earlier and repeat til success or timeout
1 parent bb5d0ac commit 1543fe0

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

irods/test/login_auth_test.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,19 @@ IRODS_SERVER_CONFIG=/etc/irods/server_config.json
66
IRODS_SERVICE_ACCOUNT_ENV_FILE=~irods/.irods/irods_environment.json
77
LOCAL_ACCOUNT_ENV_FILE=~/.irods/irods_environment.json
88

9+
cannot_iinit=''
10+
tries=8
11+
while true; do
12+
iinit_as_rods && break
13+
[ $((--tries)) -le 0 ] && { cannot_iinit=1; break; }
14+
sleep 5
15+
done
16+
[ -n "$cannot_iinit" ] && { echo >&2 "Could not iinit as rods after repeated attempts."; exit 2; }
17+
918
setup_preconnect_preference DONT_CARE
1019

1120
add_irods_to_system_pam_configuration
1221

13-
# Configure clients with admin user but no TLS yet because that requires rescan of config in >= iRODS 5.0
14-
iinit_as_rods || { echo >&2 "couldn't iinit as rods"; exit 2; }
1522

1623
# set up /etc/irods/ssl directory and files
1724
set_up_ssl sudo

0 commit comments

Comments
 (0)