minor fixes

diff --git a/README b/README
index f77aa11235945efd4c4c26610eaf1f2eee41c17e..32cd82954b4c117562c599ef5ca0573ee6eb58dc 100644 (file)
--- a/README
+++ b/README
@@ -106,28 +106,28 @@ reboot
 # dirinstall
 
 host=kw
-distro=flidas
+distro=trisquel
 t=/tmp/d
-# be root:
+myfai-chboot default
 sudo sed -i 's/^LOGUSER=/#LOGUSER=/' /etc/fai/fai.conf
-# required after a failed run
-umount /var/lib/fai/config ||:
+# config umount required after a failed run, proc umount always required
+sudo umount /var/lib/fai/config ||: ; sudo umount -R $t/proc ||:
 fai-redep faiserver $distro
-rm -rf $t ; mkdir $t; fai -N -u $host dirinstall $t
+sudo rm -rf $t ; mkdir $t; time sudo LANG= fai -N -u $host dirinstall $t
 
 # cleanup:
 sudo sed -i 's/^#LOGUSER=/LOGUSER=/' /etc/fai/fai.conf
-s umount -R $t/proc
+sudo umount -R $t/proc
 
 
 # Turning a dirinstall into a basefile. taken from mk-basefile
 
-chroot $t apt-get clean
-rm -f $t/etc/hostname $t/etc/resolv.conf \
+sudo chroot $t apt-get clean
+sudo rm -f $t/etc/hostname $t/etc/resolv.conf \
       $t/var/lib/apt/lists/*_* $t/usr/bin/qemu-*-static \
       $t/etc/udev/rules.d/70-persistent-net.rules
-> $t/etc/machine-id
-tar --one-file-system -C $t -cf - . | gzip > /a/bin/fai-basefiles/basefiles/FLIDAS64X.tar.gz
+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:
 The license for the project is GPLv2 or later, mostly because fai is and

diff --git a/fai-redep b/fai-redep
index 9938c3bd639b22619aa2ebdce6495c853524aca3..eafb1dc6426caa9c9dadf1f64350de27ceb66215 100755 (executable)
--- a/fai-redep
+++ b/fai-redep
@@ -32,7 +32,7 @@ case $1 in
 esac
 
 host=${1:-faiserver}
-
+distro=$2
 
 # i use faiserver as a dns alias, but ssh key is associated with
 # a canonical hostname and we will have ssh warning spam unless we
@@ -55,7 +55,7 @@ tar -cz /p/c/machine_specific/*/filesystem/etc/ssh | \
 
 
 . /a/bin/distro-setup/pkgs
-pall+=($(/a/bin/buildscripts/emacs -p; /a/bin/distro-setup/distro-pkgs $2))
+pall+=($(/a/bin/buildscripts/emacs -p; /a/bin/distro-setup/distro-pkgs $distro))
 { echo PACKAGES install; echo "${pall[*]}"|sed 's/ /\n/g'; } | \
   ssh root@$faiserver_host dd of=/srv/fai/config/package_config/DESKTOP 2>/dev/null ||: # broken pipe
 

diff --git a/faiserver-setup b/faiserver-setup
index f1ede11628990d3b920787981bb6f2f6756a0a2d..bbc4f50c27fd2e83d2778f3a67579d53ec274f90 100755 (executable)
--- 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
@@ -85,14 +85,14 @@ 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
-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
@@ -103,7 +103,8 @@ apt-get update
 # 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
@@ -164,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
 

diff --git a/lk b/lk
index 5bd5833d158363576beaf82744012334dbf79615..51b91d955d5d637a8f49c59c3f345bd96053b23d 100644 (file)
--- a/lk
+++ b/lk
@@ -42,7 +42,7 @@ if grep -q ID=ubuntu /etc/os-release; then
     # add universe, pxe-kexec is there
     sed -ri '/^\s*deb/{/universe/!s/$/ universe/}' /etc/apt/sources.list
 fi
-if ! type -p pxe-kexec &>/dev/null; then
+if ! type -p pxe-kexec >/dev/null 2>&1; then
     apt-get update
     apt-get install -y debconf
     debconf-set-selections <<EOF

diff --git a/myfai-chboot b/myfai-chboot
index d0c0a97323d89d02d9b7da9748f5b1d4ad0235c2..de798e4d1afc0db0a8d0bd6c6421c423e00ed682 100755 (executable)
--- a/myfai-chboot
+++ b/myfai-chboot
@@ -6,8 +6,8 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 x=$(readlink -f "$BASH_SOURCE"); cd ${x%/*}
 
 usage() {
-    cat <<EOF
-usage: ${0##*/} [-h|--help] [hostname|ip]
+  cat <<EOF
+usage: ${0##*/} [-h|--help] HOSTNAME|IP|default
 
 Sets up tftp pxe config and nfs server on host "faiserver".
 
@@ -27,10 +27,13 @@ to disable the nfs server.
 -h|--help   Print help and exit.
 
 EOF
-    exit $1
+  exit $1
 }
+if [[ ! $1 ]]; then
+  usage 1
+fi
 case $1 in
-    -h|--help) usage ;;
+  -h|--help) usage ;;
 esac
 
 

diff --git a/wrt-setup b/wrt-setup
index 1c4a033c3f3c4cf9c92ab70bd1aa612920db6379..ed9cc27fdea44b68196fdf855db84819a9265bdb 100755 (executable)
--- a/wrt-setup
+++ b/wrt-setup
@@ -324,8 +324,8 @@ fi
 mkdir -p /mnt/usb/tftpboot
 v cedit /etc/dnsmasq.conf <<'EOF' || dnsmasq_restart=true
 
-############ updating dns servers ###################3
-
+# https://ret2got.wordpress.com/2018/01/19/how-your-ethereum-can-be-stolen-using-dns-rebinding/
+stop-dns-rebind
 
 # this says the ip of default gateway and dns server,
 # but I think they are unneded and default
@@ -364,7 +364,9 @@ server=2001:4860:4860::8844
 dhcp-host=f4:6d:04:02:ed:66,set:treetowl,192.168.1.2,treetowl
 dhcp-host=00:26:18:97:bb:16,set:frodo,192.168.1.3,frodo
 dhcp-host=10:78:d2:da:29:22,set:htpc,192.168.1.4,htpc
-dhcp-host=00:1f:16:16:39:24,set:kw,192.168.1.5,x2
+dhcp-host=00:1f:16:16:39:24,set:x2,192.168.1.5,x2
+#wireless interface
+#dhcp-host=00:22:5f:88:28:27,set:x2,192.168.1.5,x2
 #dhcp-host=00:1f:16:16:39:24,set:kw,192.168.1.10,kw
 #dhcp-host=00:c0:ca:27:e9:b2,set:kww,192.168.1.11,kww
 # this is so fai can have an explicit name to use for testing,