From b37b993eea98eb7eeab8fa0f03bab22fe8f88a7c Mon Sep 17 00:00:00 2001 From: William Wernert Date: Fri, 15 May 2020 10:43:20 -0400 Subject: [PATCH] [fix] Don't say we're downloading containers on iso install --- setup/so-setup | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/setup/so-setup b/setup/so-setup index 1c08796ac..0fa16e110 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -319,7 +319,6 @@ export percentage=0 master_pillar 2>> "$setup_log" fi - set_progress_str 16 'Running first Salt checkin' salt_firstcheckin 2>> "$setup_log" @@ -358,7 +357,12 @@ export percentage=0 set_progress_str 25 'Configuring firewall' set_initial_firewall_policy 2>> "$setup_log" - set_progress_str 26 'Downloading containers from the internet' + if [[ "$setup_type" == 'iso' ]]; then + set_progress_str 26 'Copying containers from iso' + else + set_progress_str 26 'Downloading containers from the internet' + fi + salt-call state.apply -l info registry >> "$setup_log" 2>&1 docker_seed_registry 2>> "$setup_log" # ~ 60% when finished