From 15da839e14b07b30de9c3f7559bd17213e4f193d Mon Sep 17 00:00:00 2001
From: Ian Kelling <iank@fsf.org>
Date: Sun, 2 Sep 2018 20:23:35 -0400
Subject: [PATCH] fatal fixes to faiserver setup

---
 faiserver-setup | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/faiserver-setup b/faiserver-setup
index b9fe68f..2348db0 100755
--- a/faiserver-setup
+++ b/faiserver-setup
@@ -17,7 +17,7 @@
 
 x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
 
-[[ $EUID == 0 ]] || exec sudo "${BASH_SOURCE}" "$@"
+[[ $EUID == 0 ]] || exec sudo -i "${BASH_SOURCE}" "$@"
 
 usage() {
   cat <<EOF
@@ -48,6 +48,12 @@ e() { echo "$@"; "$@"; }
 base=stretch
 sed="sed -ri --follow-symlinks"
 
+if [[ ! -e $BASEFILE_DIR/STRETCH64.tar.gz ]]; then
+  printf "%s\n" "$0: error BASEFILE_DIR=$BASEFILE_DIR \$BASEFILE_DIR/STRETCH64.tar.gz does not exist"
+  exit 1
+fi
+
+
 if ! type -p wget &>/dev/null; then
   apt-get install -y wget
 fi
@@ -82,7 +88,7 @@ EOF
 elif grep -xFq 'VERSION="8 (jessie)"' /etc/os-release; then
   gpg -a --recv-keys 2BF8D9FE074BCDE4; gpg -a --export 2BF8D9FE074BCDE4 | apt-key add -
   cat >/etc/apt/sources.list.d/fai.list <<'EOF'
-deb http://fai-project.org/download jessie koeln
+deb https://fai-project.org/download jessie koeln
 EOF
 elif grep -xFq 'VERSION="9 (stretch)"' /etc/os-release || grep -iE 'flidas|xenail' /etc/os-release ; then
   # fai on ubuntu only has official support using the universe repo, but newer
@@ -90,7 +96,7 @@ elif grep -xFq 'VERSION="9 (stretch)"' /etc/os-release || grep -iE 'flidas|xenai
   gpg --keyserver hkp://pool.sks-keyservers.net -a --recv-keys 2BF8D9FE074BCDE4; gpg -a --export 2BF8D9FE074BCDE4 | apt-key add -
 
   cat >/etc/apt/sources.list.d/fai.list <<'EOF'
-deb http://fai-project.org/download stretch koeln
+deb https://fai-project.org/download stretch koeln
 EOF
 else
   rm -f /etc/apt/sources.list.d/fai.list
-- 
2.30.2