fix stretch, upgrade from jessie broke

[automated-distro-installer] / faiserver-setup

diff --git a/faiserver-setup b/faiserver-setup
index 724a09c7bce7e4182dd9d01658cb7169e9102f28..aa83685f2d6fac03a443823131b4cedf0ef6e43e 100755 (executable)
--- a/faiserver-setup
+++ b/faiserver-setup
@@ -15,10 +15,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+# Usage: faiserver-setup
+#
 # Initial setup of a fai server on debian. works on localhost.
 # Set's the current ip as the tftp server. I vaguely remember
-# that using a hostname does not work
-# Requires changing dns to point faiserver and running fai-redep
+# that using a hostname does not work.
+# Separate from running this, faiserver needs to be setup in dns
+# to point to whatever host this is run on.
 
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
@@ -27,7 +30,10 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 e() { echo "$@"; "$@"; }
 
-base=${1:-jessie}
+# tried with stretch at one point, but jessie works for everything,
+# so no point in changing it. Leaving some code to deal with
+# stretch hanging around as it will eventually become stable.
+base=jessie
 sed="sed -ri --follow-symlinks"
 
 
@@ -37,6 +43,7 @@ if [[ $base == jessie ]]; then
 deb http://fai-project.org/download jessie koeln
 EOF
 else
+    # if we use stretch, no need for fai-project repo.
     rm -f /etc/apt/sources.list.d/fai.list
 fi
 
@@ -65,7 +72,6 @@ r=http://http.us.debian.org/debian
 dd of=/etc/fai/apt/sources.list <<EOF
 deb $r $base main contrib non-free
 deb http://security.debian.org/debian-security $base/updates main contrib non-free
-
 EOF
 
 if [[ $base == jessie ]]; then