From 3b10d7ee0f50e3b592f694d813e614956d946dc8 Mon Sep 17 00:00:00 2001
From: Gregory Ballantine <gballantine@metaunix.net>
Date: Tue, 23 Apr 2024 13:05:03 -0400
Subject: [PATCH] Fixed a couple typos in the initial-setup script

---
 scripts/initial-setup.sh | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/scripts/initial-setup.sh b/scripts/initial-setup.sh
index 0a782a3..c37c006 100644
--- a/scripts/initial-setup.sh
+++ b/scripts/initial-setup.sh
@@ -4,30 +4,15 @@ SALT_MASTER='salt-v1.int.metaunix.net'
 
 # determine OS version
 if [ -f '/etc/redhat-release' ]; then
-  OS="debian"
-elif [ -f '/etc/debian-release' ]; then
   OS="rhel"
+elif [ -f '/etc/debian_version' ]; then
+  OS="debian"
 elif [ -d '/etc/ubuntu-advantage' ]; then
   OS="ubuntu"
 else
   OS="freebsd"
 fi
 
-read -p 'System hostname: ' HOSTNAME
-read -p 'System domain: ' DOMAIN
-
-if [ "$OS" = 'freebsd' ]; then
-  # Configure system hostname
-  sysrc hostname="$HOSTNAME.$DOMAIN"
-
-  # Configure salt
-  echo "$HOSTNAME" > /usr/local/etc/salt/minion_id
-  sed -i .orig "s/\#master: salt/master: $SALT_MASTER/" /usr/local/etc/salt/minion
-  rm -rf /usr/local/etc/salt/pki
-
-  # Enable and start salt
-  sysrc salt_minion_enable="YES"
-  service salt_minion start
 else
   # Configure system hostname
   hostnamectl set-hostname "$HOSTNAME"