From 1bb77fb07add962f285d6e3f68c11d28e402022d Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Wed, 4 Mar 2020 13:56:49 -0500
Subject: [PATCH] Activate 18.04

---
 setup/so-functions | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index b9367890d..124db4f9b 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -351,8 +351,6 @@ detect_os() {
     OS=ubuntu
     if grep -q "UBUNTU_CODENAME=bionic" /etc/os-release; then
       OSVER=bionic
-      echo "We currently don't support Ubuntu $OSVER but we are working on it!"
-      exit
     elif grep -q "UBUNTU_CODENAME=xenial" /etc/os-release; then
       OSVER=xenial
     else
@@ -1152,8 +1150,8 @@ salt_master_directories() {
 
   # Copy over the salt code and templates
   if [ $INSTALLMETHOD == 'iso' ]; then
-    cp -R /home/onion/SecurityOnion/pillar/* /opt/so/saltstack/pillar/
-    cp -R /home/onion/SecurityOnion/salt/* /opt/so/saltstack/salt/
+    rsync -avh --exclude 'TRANS.TBL' /home/onion/SecurityOnion/pillar/* /opt/so/saltstack/pillar/
+    rsync -avh --exclude 'TRANS.TBL' /home/onion/SecurityOnion/salt/* /opt/so/saltstack/salt/
   else
     cp -R $SCRIPTDIR/../pillar/* /opt/so/saltstack/pillar/
     cp -R $SCRIPTDIR/../salt/* /opt/so/saltstack/salt/