X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=faiserver-setup;h=bbc4f50c27fd2e83d2778f3a67579d53ec274f90;hb=ee5c5007f3426705012f2943c345b1194a988c62;hp=78786c26dd35bbbe572cb74dd95379401618b013;hpb=a2b8051e808621b9a33617d0c75d212bd2141ddc;p=automated-distro-installer

diff --git a/faiserver-setup b/faiserver-setup
index 78786c2..bbc4f50 100755
--- a/faiserver-setup
+++ b/faiserver-setup
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (C) 2016 Ian Kelling
+# Copyright (C) 2018 Ian Kelling
 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -20,7 +20,7 @@ x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
 [[ $EUID == 0 ]] || exec sudo "${BASH_SOURCE}" "$@"
 
 usage() {
-    cat <<EOF
+  cat <<EOF
 usage: ${0##*/} [-h|--help]
 install fai-server on the current machine
 
@@ -34,17 +34,15 @@ For running on arm, it expects Ian's fai-basefiles repository at
 /a/bin/fai-basefiles
 
 EOF
-    exit $1
+  exit $1
 }
 case $1 in
-    -h|--help) usage ;;
+  -h|--help) usage ;;
 esac
 
 
 e() { echo "$@"; "$@"; }
 
-# 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.
@@ -56,7 +54,7 @@ if ! type -p wget &>/dev/null; then
 fi
 
 armhf() {
-    [[ $(dpkg --print-architecture) == armhf ]]
+  [[ $(dpkg --print-architecture) == armhf ]]
 }
 
 if armhf; then
@@ -87,33 +85,30 @@ elif grep -xFq 'VERSION="8 (jessie)"' /etc/os-release; then
   cat >/etc/apt/sources.list.d/fai.list <<'EOF'
 deb http://fai-project.org/download jessie koeln
 EOF
-elif grep -xFq 'VERSION="9 (stretch)"' /etc/os-release; then
+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
+  # tends to have less bugs.
   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 stretch koeln
 EOF
 else
-    rm -f /etc/apt/sources.list.d/fai.list
+  rm -f /etc/apt/sources.list.d/fai.list
 fi
 
-# for ubuntu:
-#add-apt-repository -y ppa:fai/ppa
-
-# 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. Also excludes
 # nfs-kernel-server. On an android chroot, we don\'t have nfs in the
 # kernel, or the ability to install it.
-pkgs=(fai-doc tftpd-hpa tar reprepro squashfs-tools binutils)
+# xorriso is for running fai-cd -a, not strictly need for fai-server
+pkgs=(fai-doc tftpd-hpa tar reprepro squashfs-tools binutils xorriso)
 if modprobe nfsd &>/dev/null; then
   pkgs+=(nfs-kernel-server)
 else
-    pkgs+=(apache2)
+  pkgs+=(apache2)
 fi
 
 
@@ -131,13 +126,13 @@ EOF
 
 
 case $base in
-    jessie|stretch)
-        cat >>/etc/fai/apt/sources.list <<EOF
+  jessie|stretch)
+    cat >>/etc/fai/apt/sources.list <<EOF
 # use fai repo. it's commented in the defaults. it's got bug fixes.
 # and may contain newer packages.
 deb http://fai-project.org/download $base koeln
 EOF
-        ;;
+    ;;
 esac
 
 if [[ $base == jessie ]]; then
@@ -170,6 +165,9 @@ s,^( *FAI_DEBOOTSTRAP=).*,\1"$base $r",
 EOF
 
 $sed 's/#LOGUSER/LOGUSER/' /etc/fai/fai.conf
+$sed -i '/^FAI_FLAGS=/d' /etc/fai/fai.conf
+echo "FAI_FLAGS=verbose" >>/etc/fai/fai.conf
+
 # from man fai-make-nfsroot,
 # figured out after partitioning ignored my crypt partition
 
@@ -181,7 +179,7 @@ fi
 if armhf; then
   cd /srv/fai
   rm -rf nfsroot
-  tar Jxf /a/bin/fai-basefiles/base.tar.xz
+  tar Jxf /a/bin/fai-basefiles/basefiles/STRETCH64.tar.xz
   # background: Can't build the nfsroot on my arm system now.  First,
   # fai-make-nfsroot won't work out of the box. One idea to make it work
   # is by installing qemu-user-static, then copying qemu-x86_64-static
@@ -197,28 +195,28 @@ if armhf; then
   # and if not, run it.
   setup_tftp(){
 
-      # tftp environment
-      local pxebin
-
-      # wheezy path
-      if [ -f $NFSROOT/usr/lib/PXELINUX/pxelinux.0 ]; then
-        pxebin=$NFSROOT/usr/lib/PXELINUX/pxelinux.0
-      else
-	  # jessie/stretch path
-          pxebin=$NFSROOT/usr/lib/syslinux/pxelinux.0
-      fi
-
-      rm -f $NFSROOT/boot/*.bak
-      mkdir -p $TFTPROOT/pxelinux.cfg
-      chmod a+r $NFSROOT/boot/initrd.img-* || die 9 "No initrd was created. Check the package name of the linux-image package in /etc/fai/NFSROOT."
-      cp -p $v $NFSROOT/boot/vmlinu?-* $NFSROOT/boot/initrd.img-* $TFTPROOT
-      cp -u $pxebin $TFTPROOT
-      if [ -f $NFSROOT/usr/lib/syslinux/modules/bios/ldlinux.c32 ]; then
-	cp -u $NFSROOT/usr/lib/syslinux/modules/bios/ldlinux.c32 $TFTPROOT
-      fi
-      if [ X$verbose = X1 ]; then
-	echo "TFTP environment prepared. Enable DHCP and start the TFTP daemon on root $TFTPROOT."
-      fi
+    # tftp environment
+    local pxebin
+
+    # wheezy path
+    if [ -f $NFSROOT/usr/lib/PXELINUX/pxelinux.0 ]; then
+      pxebin=$NFSROOT/usr/lib/PXELINUX/pxelinux.0
+    else
+      # jessie/stretch path
+      pxebin=$NFSROOT/usr/lib/syslinux/pxelinux.0
+    fi
+
+    rm -f $NFSROOT/boot/*.bak
+    mkdir -p $TFTPROOT/pxelinux.cfg
+    chmod a+r $NFSROOT/boot/initrd.img-* || die 9 "No initrd was created. Check the package name of the linux-image package in /etc/fai/NFSROOT."
+    cp -p $v $NFSROOT/boot/vmlinu?-* $NFSROOT/boot/initrd.img-* $TFTPROOT
+    cp -u $pxebin $TFTPROOT
+    if [ -f $NFSROOT/usr/lib/syslinux/modules/bios/ldlinux.c32 ]; then
+      cp -u $NFSROOT/usr/lib/syslinux/modules/bios/ldlinux.c32 $TFTPROOT
+    fi
+    if [ X$verbose = X1 ]; then
+      echo "TFTP environment prepared. Enable DHCP and start the TFTP daemon on root $TFTPROOT."
+    fi
   }
   diff -u <(type setup_tftp) <(cat <(sed -n '/^setup_tftp(){/,/^}/p' $(which fai-make-nfsroot) ) - <<'EOF' |bash
 type setup_tftp
@@ -231,10 +229,12 @@ EOF
   # seem contradictory, but it works.
   fai-setup -evag
 
-else
-    e fai-setup -e -vf
-    # make the faiserver also the apt proxy server
-    apt-get -y install apt-cacher-ng
+else # not armhf
+  # note, this copies the -B arg to
+  # /srv/fai/nfsroot/var/tmp/base.tar.xz
+  e fai-setup -evf -B /a/bin/fai-basefiles/basefiles/STRETCH64.tar.xz
+  # make the faiserver also the apt proxy server
+  apt-get -y install apt-cacher-ng
 fi
 
 { head -n 1 /srv/fai/nfsroot/root/.ssh/known_hosts | awk '{print $1}' \