From 372f694cc1b7e6268c567a6420d849470b212788 Mon Sep 17 00:00:00 2001
From: Jason Ertel <jason.ertel@securityonionsolutions.com>
Date: Sat, 14 Nov 2020 11:04:40 -0500
Subject: [PATCH] Set curl type to 'features' when adding features to existing
 installation

---
 salt/common/tools/sbin/so-features-enable | 1 +
 salt/common/tools/sbin/so-image-common    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/salt/common/tools/sbin/so-features-enable b/salt/common/tools/sbin/so-features-enable
index 581580307..a5bc5ff12 100755
--- a/salt/common/tools/sbin/so-features-enable
+++ b/salt/common/tools/sbin/so-features-enable
@@ -61,6 +61,7 @@ TRUSTED_CONTAINERS=( \
   "so-kibana" \
   "so-logstash" )
 
+CURLTYPE=features
 update_docker_containers
 
 sed -i 's/features: False/features: True/' $local_salt_dir/pillar/global.sls
diff --git a/salt/common/tools/sbin/so-image-common b/salt/common/tools/sbin/so-image-common
index 843617d86..1af101f82 100755
--- a/salt/common/tools/sbin/so-image-common
+++ b/salt/common/tools/sbin/so-image-common
@@ -17,6 +17,7 @@
 
 # Figure out if this is soup or refresh
 set_version() {
+  CURRENTVERSION=0.0.0
   if [ -f /etc/soversion ]; then
     CURRENTVERSION=$(cat /etc/soversion)
   fi