diff --git a/setup/so-functions b/setup/so-functions
index 7ab718dd3..00b00f3ab 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1318,6 +1318,11 @@ set_base_heapsizes() {
 	ls_heapsize
 }
 
+set_network_dev_status_list() {
+	readarray -t nmcli_dev_status_list <<< "$(nmcli -t -f DEVICE,STATE -c no dev status)"
+	export nmcli_dev_status_list
+}
+
 set_main_ip() {
 	MAINIP=$(ip route get 1 | awk '{print $7;exit}')
 }
diff --git a/setup/so-setup b/setup/so-setup
index 4b172efed..775064f9f 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -109,6 +109,7 @@ export PATH=$PATH:../salt/common/tools/sbin
 got_root
 
 detect_os && detect_ec2
+set_network_dev_status_list
 
 if [ "$OS" == ubuntu ]; then
 	update-alternatives --set newt-palette /etc/newt/palette.original >> $setup_log 2>&1
diff --git a/setup/so-variables b/setup/so-variables
index bd5f8869d..1123562d9 100644
--- a/setup/so-variables
+++ b/setup/so-variables
@@ -44,6 +44,3 @@ export local_salt_dir=/opt/so/saltstack/local
 
 SCRIPTDIR=$(cd "$(dirname "$0")" && pwd)
 export SCRIPTDIR
-
-readarray -t nmcli_dev_status_list <<< "$(nmcli -t -f DEVICE,STATE -c no dev status)"
-export nmcli_dev_status_list