From 34839ddd0fbddfe203a3aa5b3387186a273e31df Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Sat, 12 May 2018 14:44:35 -0400 Subject: [PATCH] fixes plus readme updates --- README | 38 +++++++++++++++++++++++++++----- fai-redep | 2 +- fai-revm | 22 +++++++++++++++--- fai/config/class/50-host-classes | 7 ++++++ faiserver-setup | 20 ++++++++++++++--- wrt-setup | 8 ++----- 6 files changed, 78 insertions(+), 19 deletions(-) diff --git a/README b/README index 32cd829..60c6e6f 100644 --- a/README +++ b/README @@ -1,10 +1,9 @@ PXE install w multi-boot, btrfs & Libreboot support Some things are specific to my home network, and uses files with secrets -that are not in this repo. Uses pxe or pxe-kexec (on libreboot, I have -not added a pxe rom, I use a minimal debian stable subvolume which acts -like a pxe rom). I use this for bare metal and vms, and two scripts -which can run post boot so I use them on vps distributed image as well. +that are not in this repo. I use this for bare metal and vms, and two +scripts which can run post boot so I use them on vps distributed image +as well. Features people may find useful: installs encrypted trisquel, debian, ubuntu, and arch (havne't done recently, probably a bit broken), in a @@ -12,6 +11,27 @@ multi-boot setup using multiple subvolumes of a single btrfs filesystem. Utilizes multiple disks, with scripts to automatically decrypt on intentional reboots, but not after shutdown or power loss. +Normal install mode for fai is using pxe, but on a libreboot system, +there is no pxe. The pxe in a normal computer is nonfree firmware. What +I've done instead: + +* Use a live cd to call pxe-kexec, this is described later in this file. + +* Use the fai autodiscover iso. This is more automated, so nicer. + +* Use an install method above to setup a gnu/linux disk partition that + acts like a pxe boot using kexec, but it takes a bit longer. This is + the bootstrap partition in my scripts. + +Things I haven't tried: + +* There is iPXE, which requires standard bios functions, which can be + provided by seabios, which can be a libreboot payload. + +* The bios chip has enough room for an initrd. This could be setup to + work like the partition I use to kexec, but it would be faster, and + not require installing to disk. + The partititioning and filesystem script is at fai/config/hooks/partition.DEFAULT. Disks are grouped as ssd or hdd and raided in raid 1 or raid 0 per configuration. The base partitions are @@ -43,6 +63,8 @@ Some of the scripts have dependencies for some simple obvious utility scripts from https://iankelling.org/git, and of course there are some hostnames that are specific to my network. + + All scripts meant to be used directly are listed here: @@ -81,6 +103,7 @@ fai-wrapper # use fai classes outside of fai. sourced, not called. faiserver-disable # Disable the fai nfs server exports fresize # resize swap or boot partitions in a host + # Replacing a raid 10 disk pxe-server -S HOST fai @@ -107,7 +130,7 @@ reboot host=kw distro=trisquel -t=/tmp/d +t=/dev/shm/t myfai-chboot default sudo sed -i 's/^LOGUSER=/#LOGUSER=/' /etc/fai/fai.conf # config umount required after a failed run, proc umount always required @@ -129,7 +152,10 @@ sudo rm -f $t/etc/hostname $t/etc/resolv.conf \ echo | sudo dd of=$t/etc/machine-id sudo tar --one-file-system -C $t -cf - . | gzip > /a/bin/fai-basefiles/basefiles/FLIDAS64X.tar.gz -License stuff: + + +# License + The license for the project is GPLv2 or later, mostly because fai is and I periodically merge the upstream example config, which contains small scripts. Also, there is a modified encrypt.upstream, which is from the diff --git a/fai-redep b/fai-redep index eafb1dc..94a85db 100755 --- a/fai-redep +++ b/fai-redep @@ -23,7 +23,7 @@ usage() { cat </etc/apt/sources.list.d/fai.list <<'EOF' deb http://fai-project.org/download stretch koeln @@ -104,6 +104,7 @@ apt-get update # nfs-kernel-server. On an android chroot, we don\'t have nfs in the # kernel, or the ability to install it. # xorriso is for running fai-cd -a, not strictly need for fai-server +# perl-tk is for fai-monitor-gui pkgs=(fai-doc tftpd-hpa tar reprepro squashfs-tools binutils xorriso) if modprobe nfsd &>/dev/null; then pkgs+=(nfs-kernel-server) @@ -113,7 +114,9 @@ fi apt-get install -y ${pkgs[@]} -apt-get install --no-install-recommends -y fai-server +# confnew since we edit /etc/fai/NFSROOT in an automated way +# fai-client is already a fai-server dependency, but make sure it gets upgraded +apt-get install --no-install-recommends -y -o Dpkg::Options::="--force-confnew" fai-server fai-client r=http://http.us.debian.org/debian # like default, but scrap httpredir, and nonfree. @@ -208,7 +211,10 @@ if armhf; then 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." + if ! chmod a+r $NFSROOT/boot/initrd.img-*; then + echo "$0: error: No initrd was created. Check the package name of the linux-image package in /etc/fai/NFSROOT." + exit 1 + fi 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 @@ -233,6 +239,14 @@ 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 + # fai-setup expert mode avoids writing to /var/log/fai/variables + # at least config_src is needed for autodiscover + $sed '/^FAI_CONFIGDIR|^FAI_CONFIG_SRC|^LOGUSER/d' /var/log/fai/variables + tee -a /var/log/fai/variables <<'EOF' +LOGUSER=fai +FAI_CONFIGDIR=/srv/fai/config +FAI_CONFIG_SRC=nfs://faiserver/srv/fai/config +EOF # make the faiserver also the apt proxy server apt-get -y install apt-cacher-ng fi diff --git a/wrt-setup b/wrt-setup index ed9cc27..ab2e5c5 100755 --- a/wrt-setup +++ b/wrt-setup @@ -274,8 +274,7 @@ v cedit /etc/hosts <