minor fixes and documentation

[automated-distro-installer] / faiserver-setup

diff --git a/faiserver-setup b/faiserver-setup
index 96485a5634ea1c34db1210207107124517ecb51c..3db726547136c4fba7d636c1a8097c72c18c5a1c 100755 (executable)
--- a/faiserver-setup
+++ b/faiserver-setup
@@ -30,21 +30,24 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 e() { echo "$@"; "$@"; }
 
-# 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.
+# When stretch becomes stable, change this to stretch.
+# I've tested this with stretch, it works, but notably,
+# the automatic basefile getting will be for stretch
+# instead of jessie, so if you install jessie, you need
+# to setup the basefile and it's corresponding class.
 base=jessie
 sed="sed -ri --follow-symlinks"
 
-
-if [[ $base == jessie ]]; then
-  wget -O - http://fai-project.org/download/074BCDE4.asc | apt-key add -
-  cat >/etc/apt/sources.list.d/fai.list <<'EOF'
+if grep -xFq 'VERSION="9 (stretch)"' /etc/os-release; then
+  # if we use stretch, no need for fai-project repo.
+  # this will need to be updated when there is a codename
+  # for stretch+1
+  rm -f /etc/apt/sources.list.d/fai.list
+else
+    wget -O - http://fai-project.org/download/074BCDE4.asc | apt-key add -
+    cat >/etc/apt/sources.list.d/fai.list <<'EOF'
 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
 
 # for ubuntu:
@@ -52,6 +55,14 @@ fi
 
 # for debian:
 
+
+apt-get update
+
+# Relevant packages from fai-quickstart depends and fai-server recommends.
+# I especially do not wait isc-dhcp-server or an inetd
+apt-get install -y fai-doc nfs-kernel-server tftpd-hpa tar reprepro squashfs-tools binutils
+apt-get install --no-install-recommends -y fai-server
+
 r=http://http.us.debian.org/debian
 # like default, but scrap httpredir, and nonfree.
 # All my systems should be able to get along without nonfree
@@ -78,21 +89,6 @@ Pin-Priority: 500
 EOF
 fi
 
-apt-get update
-# all the dependencies except the dhcp server
-deps="$(apt-cache show fai-quickstart | grep ^Depends: |head -n 1|\
-              sed -r 's/^Depends:|,|\|[^,]+|isc-dhcp-server//g')"
-to_install=(tar)
-for pkg in $deps; do
-    dpkg -s $pkg &>/dev/null && continue ||:
-    to_install+=($pkg)
-    # just so we have a record.
-    echo `date` $pkg >>/var/log/fai-manually-installed-packages.log
-done
-if [[ $to_install ]]; then
-  apt-get -y install ${to_install[@]}
-fi
-
 
 # tried out a stretch base, doesn't work yet.
 $sed -f - /etc/fai/nfsroot.conf <<EOF