From 875cea0c266c7802b336f5a8b61b63e109e670fb Mon Sep 17 00:00:00 2001
From: Ian Kelling <ian@iankelling.org>
Date: Sat, 11 Feb 2017 13:20:27 -0800
Subject: [PATCH] ssh key fix, consistent help args

---
 README                               |  4 +--
 arch-init-remote                     | 16 ++++++----
 eboot                                | 28 +++++++++++++++-
 fai-kexec                            |  1 -
 fai-revm                             |  1 -
 fai/config/distro-install-common/end | 23 +++++++------
 fai/config/scripts/GRUB_PC/11-ian    |  5 ++-
 faiserver-revm                       | 19 ++++++++---
 faiserver-setup                      | 26 ++++++++++-----
 faiserver-uninstall                  | 14 +++++++-
 install-chboot                       | 19 +++++++++--
 live-kexec                           | 48 +++++++++++++++++++++-------
 myfai-chboot                         |  2 --
 wrt-setup-remote                     | 14 ++++++--
 14 files changed, 164 insertions(+), 56 deletions(-)

diff --git a/README b/README
index fa28fa9..af4c0ba 100644
--- a/README
+++ b/README
@@ -61,7 +61,7 @@ wrt-setup-remote  # setup my router in general: dhcp, dns, etc.
 
 # Scripts to do a distro install
 
-arch-init-remote # install arch (after it's been booted into it's setup env)
+arch-init-remote # install arch after it's been booted into it's setup env
 dsfull # install & post-install a new fai distro
 fai-kexec # kexec to fai tftp server that pxe would normally point to
 arch-revm # test arch install on a fresh vm
@@ -74,7 +74,7 @@ live-kexec # fai kexec from upstream live cds, e.g. curl live-kexec|bash
 chboot # Set grub to boot into a different distro (installed earlier)
 install-chboot # reinstall chboot to /boot subvols, for chboot updates.
 eboot # reboot without automatic disk decryption
-fai-wrapper # Evaluate and use fai classes outside of fai.
+fai-wrapper # use fai classes outside of fai. sourced, not called.
 fresize # resize swap or boot partitions in a host
 
 
diff --git a/arch-init-remote b/arch-init-remote
index 6e460a5..76e2cf2 100755
--- a/arch-init-remote
+++ b/arch-init-remote
@@ -15,17 +15,21 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+set -x
+
+set -eE -o pipefail
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+
 usage() {
     cat <<EOF
-Usage: ${0##*/} HOSTNAME
+Usage: ${0##*/} [-h|--help] HOSTNAME
+install arch after it's been booted into it's setup env
 EOF
     exit $1
 }
-
-set -x
-
-set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+case $1 in
+    -h|--help) usage ;;
+esac
 
 if [[ ! $1 ]]; then
     echo "error: expect a hostname in \$1 "
diff --git a/eboot b/eboot
index cb487cb..6d5ce5e 100755
--- a/eboot
+++ b/eboot
@@ -1,6 +1,32 @@
 #!/bin/bash
+# Copyright (C) 2017 Ian Kelling
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+
+usage() {
+    cat <<EOF
+Usage: ${0##*/} [-h|--help]
+reboot and keep disks encrypted
+EOF
+    exit $1
+}
+case $1 in
+    -h|--help) usage ;;
+esac
 
-# reboot and keep disks encrypted.
 touch /tmp/keyscript-off
 [[ $EUID == 0 ]] || s=sudo
 $s reboot "$@"
diff --git a/fai-kexec b/fai-kexec
index b674d7e..a49abe1 100755
--- a/fai-kexec
+++ b/fai-kexec
@@ -30,7 +30,6 @@ including the pxe dhcp.
 EOF
     exit $1
 }
-
 case $1 in
     -h|--help) usage ;;
 esac
diff --git a/fai-revm b/fai-revm
index 57e5586..8d782c0 100755
--- a/fai-revm
+++ b/fai-revm
@@ -43,7 +43,6 @@ EOF
     exit $1
 }
 
-
 new_disk=false
 temp=$(getopt -l help hnr "$@") || usage 1
 eval set -- "$temp"
diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index 629e47a..90082de 100755
--- a/fai/config/distro-install-common/end
+++ b/fai/config/distro-install-common/end
@@ -8,6 +8,19 @@ if [[ $EUID != 0 ]]; then
     exit 1
 fi
 
+# ssh host keys
+# note, $BASH_SOURCE is not defined here under fai.
+src=$(dirname "$0")/p/c/machine_specific/$HOSTNAME/filesystem/etc/ssh
+dst=$target/etc/ssh
+if [[ -e $src && -e $dst ]]; then
+    # outside of fai context, we skip this
+    cp -rT $src $dst
+fi
+
+if ifclass VOL_STABLE_BOOTSTRAP; then
+    exit 0
+fi
+
 TPW=/q/root/shadow/traci-simple
 if ifclass tp; then
     ROOTPW="$TPW"
@@ -66,16 +79,6 @@ if [[ ! -e $f ]] || ! grep -xF "$line" $f; then
     echo "$line" >> $f
 fi
 
-# ssh host keys
-# note, $BASH_SOURCE is not defined here under fai.
-src=$(dirname "$0")/p/c/machine_specific/$HOSTNAME/filesystem/etc/ssh
-dst=$target/etc/ssh
-if [[ -e $src && -e $dst ]]; then
-    # outside of fai context, we skip this
-    cp -rT $src $dst
-fi
-
-
 dir=/p/c/machine_specific/$HOSTNAME/.unison
 $ROOTCMD mkdir -p $dir
 if ! $ROOTCMD test -L /root/.unison; then
diff --git a/fai/config/scripts/GRUB_PC/11-ian b/fai/config/scripts/GRUB_PC/11-ian
index 8cd841f..8df5b13 100755
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -40,17 +40,16 @@ if [[ ! -e $dst && -e $src ]]; then
   mount -o bind $src $dst
 fi
 
+$FAI/distro-install-common/end
 if ifclass VOL_STABLE_BOOTSTRAP; then
   fcopy -ri /etc/systemd/system
   chroot $FAI_ROOT bash <<'EOFOUTER'
 systemctl enable fai_check.service
 EOFOUTER
-  exit 0
+  exit 0 # avoid unnecessary stuff in bootstrap vol
 fi
 
 
-$FAI/distro-install-common/end
-
 # these get copied in an earlier stage by fai, but leaving it here since
 # I run this as a single post-fai script to update things that have changed.
 fcopy -riB /etc/apt
diff --git a/faiserver-revm b/faiserver-revm
index a0a0bb8..6d598a6 100755
--- a/faiserver-revm
+++ b/faiserver-revm
@@ -1,9 +1,4 @@
 #!/bin/bash -l
-# Usage: faiserver-revm
-# Create a vm which is a fai server.
-#
-# This assumes you've set the dhcp server to make
-# 52:54:00:56:09:f9 be faiserver.
 set -x
 
 set -eE -o pipefail
@@ -12,6 +7,20 @@ trap 'cleanup; echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 x="$(readlink -f "$BASH_SOURCE")"; cd ${x%/*}
 
+usage() {
+    cat <<EOF
+usage: ${0##*/} [-h|--help]
+Create a vm which is a fai server.
+
+This assumes you've set the dhcp server to make 52:54:00:56:09:f9 be
+faiserver. That mac is a randomly generated one in the libvirt range.
+EOF
+    exit $1
+}
+case $1 in
+    -h|--help) usage ;;
+esac
+
 cleanup() { pxe-server :; }
 ./debian-pxe-preseed -i 192.168.1.1 -u ian -g vda
 
diff --git a/faiserver-setup b/faiserver-setup
index 3db7265..fd2ab00 100755
--- a/faiserver-setup
+++ b/faiserver-setup
@@ -15,19 +15,29 @@
 # 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 "$@"; "$@"; }
 
 # When stretch becomes stable, change this to stretch.
diff --git a/faiserver-uninstall b/faiserver-uninstall
index dee2409..71a4ea0 100755
--- a/faiserver-uninstall
+++ b/faiserver-uninstall
@@ -20,5 +20,17 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 [[ $EUID == 0 ]] || exec sudo "${BASH_SOURCE}" "$@"
 
+usage() {
+    cat <<EOF
+usage: ${0##*/} [-h|--help]
+uninstall fai-server
+EOF
+    exit $1
+}
+case $1 in
+    -h|--help) usage ;;
+esac
 
-apt-get -y purge $(< /etc/fai/fai-manually-installed-packages)
+
+apt-get -y remove --purge --auto-remove fai-doc nfs-kernel-server \
+        tftpd-hpa tar reprepro squashfs-tools binutils fai-server
diff --git a/install-chboot b/install-chboot
index d066101..69f46df 100755
--- a/install-chboot
+++ b/install-chboot
@@ -20,12 +20,25 @@
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
-# usage install-chboot: isntalls chboot to all /boot subvols,
-# in case there is an issue booting and it is needed.
-# Run this when chboot changes.
 
 x=$(readlink -f "$BASH_SOURCE"); cd ${x%/*}
 
+usage() {
+    cat <<EOF
+Usage: ${0##*/} [-h|--help]
+reinstall chboot to /boot subvols, for chboot updates.
+
+We install to /boot in case there is an issue booting and only the /boot
+vol is readily available. For the bootstrap subvol, this is the normal
+case.
+EOF
+    exit $1
+}
+case $1 in
+    -h|--help) usage ;;
+esac
+
+
 e() { echo "$@"; "$@"; }
 
 boot_dev=$(mount | sed -rn "s#^(\S+) on /boot .*#\1#p")
diff --git a/live-kexec b/live-kexec
index 651dad7..aef7342 100644
--- a/live-kexec
+++ b/live-kexec
@@ -1,15 +1,41 @@
 #!/bin/bash
-#
-# fai kexec from upstream live cds, i.e. curl|bash
-# You can copy this to a http server, then wget -O- url|sudo bash
-# curl is sometimes not preinstalled on a live cd.
-#
-# This has been tested on trisquel belanos and ubuntu xenial.
-#
-# If the screen just sits in a weird color inverted, corrupted looking state,
-# it's probably nothing wrong with the computer, but a problem
-# with the fai server. If you can do this from a virtual terminal,
-# it will print out more info (I know from running it on a vm).
+# Copyright (C) 2016 Ian Kelling
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+usage() {
+    cat <<EOF
+Usage: ${0##*/} [-h|--help]
+fai kexec from upstream live cds, i.e. curl|bash
+
+You can copy this to a http server, then wget -O- url|sudo bash
+curl is sometimes not preinstalled on a live cd.
+
+This has been tested on trisquel belanos and ubuntu xenial.
+
+If the screen just sits in a weird color inverted, corrupted looking state,
+it's probably nothing wrong with the computer, but a problem
+with the fai server. If you can do this from a virtual terminal,
+it will print out more info (I know from running it on a vm).
+EOF
+    exit $1
+}
+case $1 in
+    -h|--help) usage ;;
+esac
+
 
 set -ex
 if grep -q ID=ubuntu /etc/os-release; then
diff --git a/myfai-chboot b/myfai-chboot
index 310969e..11c3eae 100755
--- a/myfai-chboot
+++ b/myfai-chboot
@@ -15,8 +15,6 @@ hosts.
 EOF
     exit $1
 }
-
-
 case $1 in
     -h|--help) usage ;;
 esac
diff --git a/wrt-setup-remote b/wrt-setup-remote
index d67035b..3dadb14 100755
--- a/wrt-setup-remote
+++ b/wrt-setup-remote
@@ -16,13 +16,23 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 
-# Usage: wrt-setup-remote
-
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 x="$(readlink -f "$BASH_SOURCE")"; cd ${x%/*}
 
+usage() {
+    cat <<EOF
+usage: ${0##*/} [-h|--help]
+setup my router in general: dhcp, dns, etc.
+EOF
+    exit $1
+}
+case $1 in
+    -h|--help) usage ;;
+esac
+
+
 h=root@192.168.1.1
 scp /a/bin/fai/wrt-setup /a/bin/cedit/cedit $h:/usr/bin
 ssh $h <<EOF
-- 
2.30.2