X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=faiserver-setup;h=951ec8812ac609a7cde61911ac4d47bcffb731a2;hb=1885f9677fdf2bfeac95285cf13a7d60273d096a;hp=2ecf45b69fe0b4d813d7520aaa04704047e3097f;hpb=7f77555b3d92709034fe41919358053c650c71e1;p=automated-distro-installer

diff --git a/faiserver-setup b/faiserver-setup
index 2ecf45b..951ec88 100755
--- a/faiserver-setup
+++ b/faiserver-setup
@@ -15,36 +15,49 @@
 # 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.
-# 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
 
 [[ $EUID == 0 ]] || exec sudo "${BASH_SOURCE}" "$@"
 
+usage() {
+    cat <<EOF
+usage: ${0##*/} [-h|--help]
+install fai-server on the current machine
+
+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.
+Separate from running this, faiserver needs to be setup in dns
+to point to whatever host this is run on.
+EOF
+    exit $1
+}
+case $1 in
+    -h|--help) usage ;;
+esac
+
+
 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:
@@ -54,14 +67,11 @@ 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')"
 
 # 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 -y --no-recommends fai-server
+apt-get install --no-install-recommends -y fai-server
 
 r=http://http.us.debian.org/debian
 # like default, but scrap httpredir, and nonfree.
@@ -103,7 +113,7 @@ $sed 's/#LOGUSER/LOGUSER/' /etc/fai/fai.conf
 if ! grep cryptsetup /etc/fai/NFSROOT &>/dev/null; then
   $sed '/^PACKAGES install$/a cryptsetup' /etc/fai/NFSROOT
 fi
-e fai-setup -vf
+e fai-setup -e -vf
 { head -n 1 /srv/fai/nfsroot/root/.ssh/known_hosts | awk '{print $1}' \
     | tr '\n' ' '; ssh-keyscan localhost | grep -o "ecdsa-sha2-nistp256.*"; \
   } >>/srv/fai/nfsroot/root/.ssh/known_hosts