X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=faiserver-setup;h=f1ede11628990d3b920787981bb6f2f6756a0a2d;hb=ba2a6b887fe5a9ed627e9f0947265b37abbcf7aa;hp=0bf61caf12940d5f559a53de2155bc55b61d2ed5;hpb=06d7ec6b13af05465b2d88998be2bfbe7c3c43d6;p=automated-distro-installer

diff --git a/faiserver-setup b/faiserver-setup
index 0bf61ca..f1ede11 100755
--- a/faiserver-setup
+++ b/faiserver-setup
@@ -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,21 +34,19 @@ 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.
-base=jessie
+base=stretch
 sed="sed -ri --follow-symlinks"
 
 if ! type -p wget &>/dev/null; then
@@ -56,15 +54,10 @@ if ! type -p wget &>/dev/null; then
 fi
 
 armhf() {
-    [[ $(dpkg --print-architecture) == armhf ]]
+  [[ $(dpkg --print-architecture) == armhf ]]
 }
 
-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
-elif armhf; then
+if armhf; then
   if apt-cache policy | grep o=Debian,a=testing,n=stretch &>/dev/null; then
     cat >/etc/apt/sources.list.d/testing.list <<'EOF'
 deb http://http.us.debian.org/debian testing main contrib non-free
@@ -87,18 +80,22 @@ Pin: release a=testing
 Pin-Priority: -10
 EOF
   fi
-else
-    wget -O - http://fai-project.org/download/074BCDE4.asc | apt-key add -
-    cat >/etc/apt/sources.list.d/fai.list <<'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
 EOF
-fi
-
-# for ubuntu:
-#add-apt-repository -y ppa:fai/ppa
-
-# for debian:
+elif grep -xFq 'VERSION="9 (stretch)"' /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 stretch koeln
+EOF
+elif grep -iE 'flidas|xenail' /etc/os-release; then
+    add-apt-repository -y ppa:fai/ppa
+else
+  rm -f /etc/apt/sources.list.d/fai.list
+fi
 
 apt-get update
 
@@ -110,7 +107,7 @@ pkgs=(fai-doc tftpd-hpa tar reprepro squashfs-tools binutils)
 if modprobe nfsd &>/dev/null; then
   pkgs+=(nfs-kernel-server)
 else
-    pkgs+=(apache2)
+  pkgs+=(apache2)
 fi
 
 
@@ -126,15 +123,22 @@ deb $r $base main contrib
 deb http://security.debian.org/debian-security $base/updates main contrib
 EOF
 
+
+case $base in
+  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
   cat >>/etc/fai/apt/sources.list <<'EOF'
-# uncommenting this from the defaults. it's got bug fixes.
-# repository that may contain newer fai packages for jessie
-deb http://fai-project.org/download jessie koeln
 # fix tar https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=819978
 deb http://ftp.debian.org/debian jessie-backports main
 EOF
-
   # note, fai doesn\'t look at /etc/fai/apt/preferences.d
   cat >/etc/fai/apt/preferences <<'EOF'
 Package: tar
@@ -147,8 +151,10 @@ fi
 # tried out a stretch base, doesn't work yet.
 #
 $sed -f - /etc/fai/nfsroot.conf <<EOF
-$ a FAI_ROOTPW="$(</q/root/shadow/standard)"
+$ a FAI_ROOTPW='$(</q/root/shadow/standard)'
 /^\s*FAI_ROOTPW/d
+$ a SSH_IDENTITY=/root/.ssh/home.pub
+/^\s*SSH_IDENTITY/d
 s,^( *FAI_DEBOOTSTRAP=).*,\1"$base $r",
 # add --arch amd64. this is needed on arm system which is
 # used to install amd64 clients. On amd64 servers, it's redundant.
@@ -169,7 +175,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
@@ -185,33 +191,33 @@ 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
 EOF
-)
+                              )
   setup_tftp
 
   # -g causes skipping set_root_pw() in fai-make-nfsroot, -ag
@@ -219,10 +225,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}' \