From 37464725aeecf468265275c0be0963858511398b Mon Sep 17 00:00:00 2001
From: Ian Kelling <iank@fsf.org>
Date: Tue, 7 May 2019 15:33:18 -0400
Subject: [PATCH] update hosts, fix fai-cd and wrt

---
 README                |   6 ++-
 grub.cfg.autodiscover |  13 ++---
 lk                    |   6 +--
 pxe-server            |   2 +-
 wrt-setup             |  40 +++++++---------
 wrt-setup-local       | 109 +++++++++++++++++++++++++++++++++++-------
 6 files changed, 126 insertions(+), 50 deletions(-)

diff --git a/README b/README
index 5d3bc6e..9d5e00f 100644
--- a/README
+++ b/README
@@ -69,7 +69,9 @@ use one called 5-multi-boot, which you can see example of in
 fai/config/class/50-host-classes.
 
 Before doing a fai install, you will need to populate /q/root/luks and
-/q/root/shadow, see their references.
+/q/root/shadow, see their references. You might also want to copy
+existing /etc/ssh/*host* to
+/p/c/machine_specific/HOST/filesystem/etc/ssh.
 
 
 
@@ -78,7 +80,7 @@ All scripts meant to be used directly are listed here:
 
 # Scripts to setup the environment for the install
 
-sudo fai-cd -g grub.cfg.autodiscover -f -A $BASEFILE_DIR/autodiscover.iso # create autodiscover cd
+sudo fai-cd -g $PWD/grub.cfg.autodiscover -f -A $BASEFILE_DIR/autodiscover.iso # create autodiscover cd
 mymk-basefile # Create basefiles for various distros
 archlike-pxe # Setup pxe boot server from an archlike base image
 fai-redep # Deploy fai configuration to host "faiserver"
diff --git a/grub.cfg.autodiscover b/grub.cfg.autodiscover
index 1e7ce43..6ed3a28 100644
--- a/grub.cfg.autodiscover
+++ b/grub.cfg.autodiscover
@@ -55,12 +55,6 @@ menuentry "" --unrestricted {
     set gfxpayload=$resolution
 }
 
-menuentry "Autodiscover the FAI server" {
-    set gfxpayload=$resolution
-    linux   /boot/vmlinuz FAI_FLAGS="menu,verbose,createvt" fai.discover aufs rootovl root=/dev/nfs ip=dhcp quiet
-    initrd  /boot/initrd.img
-}
-
 # ian: Added this from fai
 # note, we could replace faiserver with an ip if we didn't want to mess with dns.
 # args are copied from myfai-chboot-local
@@ -71,6 +65,13 @@ menuentry "FAI server via dns" {
 }
 
 
+menuentry "Autodiscover the FAI server" {
+    set gfxpayload=$resolution
+    linux   /boot/vmlinuz FAI_FLAGS="menu,verbose,createvt" fai.discover aufs rootovl root=/dev/nfs ip=dhcp quiet
+    initrd  /boot/initrd.img
+}
+
+
 menuentry "Boot OS of first partition on first disk" --unrestricted {
     if [ -d (cd) ]; then
        chainloader (hd0)+1
diff --git a/lk b/lk
index 03b17c6..d3d13ea 100755
--- a/lk
+++ b/lk
@@ -33,9 +33,9 @@ Alternative to http server:
 2. On another machine nc INSTALL_MACHINE 1234 <live-kexec
 Obviously beware that anyone on your network could send commands to the install machine.
 
-This has been tested on trisquel 7 & 8 & ubuntu 16.04 & 18.10.
-With 18.10 on an x200, kexec was unreliable, resulting in freezes and
-kernel panics.
+This has been tested on trisquel 7 & 8 & ubuntu 16.04 & 18.10.  With
+18.10 and trisquel 8 on an x200, kexec was unreliable, resulting in
+freezes and kernel panics.
 
 If the screen just sits in a weird color inverted, corrupted looking state,
 it's probably nothing wrong with the computer, but a problem
diff --git a/pxe-server b/pxe-server
index c46c72e..6137386 100755
--- a/pxe-server
+++ b/pxe-server
@@ -70,7 +70,7 @@ wait=false
 fsf=false
 
 case $HOSTNAME in
-  x3|kw) fsf=true ;;
+  x2|x3|kw) fsf=true ;;
 esac
 
 chboot_args=()
diff --git a/wrt-setup b/wrt-setup
index e9d620e..96a2564 100755
--- a/wrt-setup
+++ b/wrt-setup
@@ -23,45 +23,41 @@ x="$(readlink -f "$BASH_SOURCE")"; cd ${x%/*}
 
 usage() {
   cat <<EOF
-usage: ${0##*/} [-h|--help] [-2|--dev2] [HOST/IP]
+usage: ${0##*/} [-h|--help] [HOST/IP] [wrt-setup-local_ARGS]
 setup my router in general: dhcp, dns, etc.
 
-dev2 is for setting up a second device for testing etc.
+Default HOST is root@10.0.0.1
+
+Note, use -m "''" to send an empty mac arg. When we get a new enough
+bash, we can use ${@@Q} to properly pass an empty var.
+
 EOF
+  wrt-setup-local -h
   exit $1
 }
 
 h=root@10.0.0.1
 
-temp=$(getopt -l help,dev2 h2 "$@") || usage 1
-eval set -- "$temp"
-while true; do
-  case $1 in
-    -2|--dev2) local_arg=-2; shift ;;
-    -h|--help) usage ;;
-    --) shift; break ;;
-    *) echo "$0: Internal error! unexpected args: $*" ; exit 1 ;;
-  esac
-done
+case $1 in
+  -h|--help) usage ;;
+  -*) : ;;
+  ?*) h="$1"; shift ;;
+esac
 
-if (( $# > 1 )); then
-  usage 1
-fi
-
-if [[ $# == 1 ]]; then
-  read h <<<"$@"
-fi
+echo "$0: host=$h"
 
 cat ~/.ssh/home.pub | ssh $h dd of=/etc/dropbear/authorized_keys 2>/dev/null
-scp /a/bin/fai/wrt-setup-local /a/bin/cedit/cedit $h:/usr/bin
-# build for openwrt 18.06.2, r7676-cddd7b4c77
+scp /a/work/libremanage/libremanage /a/bin/fai/wrt-setup-local /a/bin/cedit/cedit $h:/usr/bin
+# relay is built for openwrt 18.06.2, r7676-cddd7b4c77
 sudo scp /q/root/shadow/router \
      /a/opt/openwrt/source/bin/packages/mips_24kc/mypackages/relay_1.0-1_mips_24kc.ipk $h:
 ssh $h <<EOF
+set -x
 if ! opkg list-installed|grep bash; then
     opkg update
     opkg install bash
 fi
 export HOME_DOMAIN=$HOME_DOMAIN
-wrt-setup-local $local_arg
+export WIRELESSMAC=$WIRELESSMAC
+wrt-setup-local $@
 EOF
diff --git a/wrt-setup-local b/wrt-setup-local
index f465da5..8b7e4c9 100755
--- a/wrt-setup-local
+++ b/wrt-setup-local
@@ -18,11 +18,67 @@
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
+
+usage() {
+  cat <<EOF
+usage: ${0##*/} [-h] [-t 2|test] [-m WIRELESS_MAC]
+setup my router in general: dhcp, dns, etc.
+
+Type 2 is for setting up a backup device. Type test is for setting up a
+testing device.
+
+Passing an empty string for WIRELESS_MAC will cause the device's native
+mac to be used.
+
+EOF
+
+  exit $1
+}
+
+
 dev2=false
-if [[ $1 == -2 ]]; then
-  dev2=true
+test=false
+hostname=wrt
+libremanage_host=wrt2
+
+lanip=1
+while getopts hm:t: opt; do
+  case $opt in
+    h) usage ;;
+    t)
+      case $2 in
+        2)
+          dev2=true
+          lanip=4
+          hostname=wrt2
+          libremanage_host=wrt
+          ;;
+        test)
+          test=true
+          ;;
+        *) echo "$0: unexpected arg to -t: $*" >&2; usage 1 ;;
+      esac
+      ;;
+    m)  mac=$OPTARG ;;
+    *) echo "$0: Internal error! unexpected args: $*" >&2 ; usage 1 ;;
+  esac
+done
+shift "$((OPTIND-1))"   # Discard the options and sentinel --
+
+if [[ ! $mac ]] && ! $test; then
+  # if we wanted to increment it
+  #WIRELESSMAC=${WIRELESSMAC:0: -1}$((${WIRELESSMAC: -1} + 2))
+  mac=$WIRELESSMAC
+fi
+
+if (( $# != 0 )); then
+  usage 1
 fi
 
+
+macpre=${mac:0: -1}
+macsuf=${mac: -1}
+
 pmirror() {
   # background: upgrading all packages is not recommended because it
   # doesn't go into the firmware. build new firmware if you want
@@ -79,11 +135,12 @@ uset() {
 ###
 ssid="check out gnu.org"
 lan=10.0.0.0
-if $dev2; then
+if $test; then
   ssid="gnuv3"
   lan=10.1.0.0
 fi
 mask=255.255.0.0
+cidr=16
 l=${lan%.0}
 
 passwd -l root ||: #already locked fails
@@ -114,10 +171,15 @@ EOFOUTER
 chmod +x /usr/bin/archlike-pxe-mount
 
 sed -i '/^root:/s,/bin/ash$,/bin/bash,' /etc/passwd
+# usb, screen, relay are for libremanage
 v pi kmod-usb-storage block-mount kmod-fs-ext4 nfs-kernel-server \
-  tcpdump openvpn-openssl adblock libusb-compat /root/relay_1.0-1_mips_24kc.ipk
-
+  tcpdump openvpn-openssl adblock libusb-compat /root/relay_1.0-1_mips_24kc.ipk \
+  screen kmod-usb-serial-cp210x kmod-usb-serial-ftdi
 
+cat >/etc/libremanage.conf <<EOF
+${libremanage_host}_type=switch
+${libremanage_host}_channel=1
+EOF
 
 
 
@@ -172,10 +234,10 @@ EOF
 # todo: restart nfs when nfs is enabled?
 #cedit /etc/exports <<EOF || v /etc/init.d/nfsd restart ||:
 cedit /etc/exports <<EOF ||:
-/mnt/usb  $lan/$netmask(rw,no_root_squash,insecure,sync,no_subtree_check)
+/mnt/usb  $lan/$cidr(rw,no_root_squash,insecure,sync,no_subtree_check)
 # for arch pxe
-/run/archiso/bootmnt	$lan/$netmask(rw,no_root_squash,insecure,sync,no_subtree_check)
-/run/parabolaiso/bootmnt	$lan/$netmask(rw,no_root_squash,insecure,sync,no_subtree_check)
+/run/archiso/bootmnt	$lan/$cidr(rw,no_root_squash,insecure,sync,no_subtree_check)
+/run/parabolaiso/bootmnt	$lan/$cidr(rw,no_root_squash,insecure,sync,no_subtree_check)
 EOF
 
 
@@ -201,10 +263,11 @@ for x in 0 1; do
   uset wireless.default_radio$x.ssid "$ssid"
   uset wireless.default_radio$x.key $key
   uset wireless.default_radio$x.encryption psk2
-  if [[ $(uci get wireless.radio$x.disabled 2>/dev/null) ]]; then
-    v uci delete wireless.radio$x.disabled
-    wireless_restart=true
+  if [[ $mac ]]; then
+    uset wireless.default_radio$x.macaddr $macpre$((macsuf + 2*x))
   fi
+  # secondary device has wireless disabled
+  uset wireless.radio$x.disabled $dev2
 done
 
 if $wireless_restart; then
@@ -338,7 +401,7 @@ v cedit /etc/hosts <<EOF || dnsmasq_restart=true
 $l.1 wrt
 $l.2 kd
 $l.3 frodo
-$l.4 htpc
+$l.4 wrt2
 $l.5 x2
 $l.6 demohost
 $l.7 x3
@@ -368,7 +431,7 @@ fi
 
 uset dhcp.@dnsmasq[0].domain b8.nz
 uset dhcp.@dnsmasq[0].local /b8.nz/
-uset system.@system[0].hostname wrt
+uset system.@system[0].hostname $hostname
 
 if [[ $(uci get adblock.global.adb_enabled) != 1 ]]; then
   v uci set adblock.global.adb_enabled=1
@@ -431,7 +494,7 @@ dhcp-host=c8:60:00:31:6b:75,set:kd,$l.2,kd
 # top port, iPXE (PCI 04:00.0) in seabios boot menu
 #dhcp-host=c8:60:00:2b:15:07,set:kd,$l.2,kd
 dhcp-host=00:26:18:97:bb:16,set:frodo,$l.3,frodo
-dhcp-host=10:78:d2:da:29:22,set:htpc,$l.4,htpc
+# 4 is reserved for a staticly configured host.
 dhcp-host=00:1f:16:16:39:24,set:x2,$l.5,x2
 # This is so fai can have an explicit name to use for testing,
 # or else any random machine which did a pxe boot would get
@@ -458,6 +521,21 @@ enable-tftp=br-lan
 tftp-root=/mnt/usb/tftpboot
 EOF
 
+uset network.lan.ipaddr $l.$lanip
+uset network.lan.netmask $mask
+uset dhcp.wan.ignore $dev2 # default is false
+if $dev2; then
+  uset network.lan.gateway $l.1
+  uset network.wan.proto none
+  uset network.wan6.proto none
+else
+  # these are the defaults
+  uset network.lan.gateway ''
+  uset network.wan.proto dhcp
+  uset network.wan6.proto dhcpv6
+fi
+
+
 if $dnsmasq_restart; then
   v /etc/init.d/dnsmasq restart
 fi
@@ -466,8 +544,7 @@ if $firewall_restart; then
   v /etc/init.d/firewall restart
 fi
 
-uset network.lan.ipaddr $l.1
-uset network.lan.netmask $mask
+
 
 if $network_restart; then
   reboot
-- 
2.30.2