fix some bugs and mix other things

diff --git a/fai/config/package_config/DEBIAN b/fai/config/package_config/DEBIAN
index 1c7cc732aec8cc0772046687db15ecc123ce9847..7543ae771b2243746a821691a15438d5d80ae5f2 100644 (file)
--- a/fai/config/package_config/DEBIAN
+++ b/fai/config/package_config/DEBIAN
@@ -1,20 +1,20 @@
+# duplicated in UBUNTU
 PACKAGES install-norec
-apt-transport-https # is only needed for stretch
 debconf-utils
 file
 less
-linuxlogo
 rsync
 openssh-client openssh-server
 time
 procinfo
-nullmailer
-eject
 locales
 console-setup kbd
 pciutils usbutils
 unattended-upgrades
 
+PACKAGES install STRETCH
+apt-transport-https
+
 PACKAGES install NONFREE
 # you may want these non-free kernel drivers
 firmware-bnx2 firmware-bnx2x firmware-realtek
@@ -36,12 +36,12 @@ PACKAGES install ARM64
 grub-efi-arm64
 linux-image-arm64
 
-# ian: note everything after the grub package should be refactored into
-# a new class. This line is duplicated in UBUNTU
+# ian: This line is duplicated in UBUNTU
 # lsof is used in my btrfs util scritps.
 # netcat is used for proxy.
 # resolvconf because if we don't install it now we have to reboot for it to
-# take effect.
+# take effect. This is explained when you do dpkg-reconfigure resolvconf,
+# and may be fixed in future releases
 PACKAGES install GRUB_PC
 grub-pc cryptsetup btrfs-tools mbuffer sudo bridge-utils netcat-openbsd resolvconf lsof
 
@@ -49,20 +49,6 @@ PACKAGES install GRUB_EFI
 grub-efi cryptsetup btrfs-tools mbuffer sudo bridge-utils netcat-openbsd resolvconf lsof
 
 
-#resolvconf because dpkg-reconfigure on it has this message in flidas:
-# Reboot recommended
-
-# Suppliers of name server information such as local caching name servers and interface configurers are expected to supply name server information to the resolvconf program. However, although
-# installation of the resolvconf package triggers them to supply their information, some of them fail to do so.
-
-# This bug would lead to loss of valid name server information on installation of the resolvconf package if the following workaround were not adopted: resolvconf includes the full contents of
-# the pre-installation /etc/resolv.conf in its database until reboot. This has the drawback that name server information is retained even if the associated interface is later deconfigured.
-# (This incorrect behavior is judged to be less harmful than the alternative of losing valid information.)
-
-# Until the bug in question is fixed and the workaround removed, the only way to ensure that resolvconf has fully correct name server information after the resolvconf package has been
-# installed on a running system is to reboot the system.
-
-
 PACKAGES install LVM
 lvm2
 

diff --git a/fai/config/package_config/UBUNTU b/fai/config/package_config/UBUNTU
index 7f25a3a9053a12e9d8527d43bf2f5faf168c505c..81670da2456755c1bd0e776cb2865fe4bd3eaff8 100644 (file)
--- a/fai/config/package_config/UBUNTU
+++ b/fai/config/package_config/UBUNTU
@@ -1,3 +1,17 @@
+# duplicated in DEBIAN
+PACKAGES install-norec
+debconf-utils
+file
+less
+rsync
+openssh-client openssh-server
+time
+procinfo
+locales
+console-setup kbd
+pciutils usbutils
+unattended-upgrades
+
 PACKAGES install I386
 linux-image-generic
 memtest86+
@@ -9,10 +23,12 @@ PACKAGES install AMD64
 linux-image-generic
 memtest86+
 
+# duplicated in DEBIAN
 PACKAGES install GRUB_PC
-grub-pc cryptsetup btrfs-tools mbuffer bridge-utils netcat-openbsd lsof
+grub-pc cryptsetup btrfs-tools mbuffer sudo bridge-utils netcat-openbsd resolvconf lsof
+
 
-PACKAGES install STRETCH64 XENIAL64
+PACKAGES install FLIDAS64 XENIAL64
 linux-image-generic-hwe-8.0
 
 PACKAGES install XORG

diff --git a/myfai-chboot b/myfai-chboot
index 2d6b527523239fc55f9cb7e2ac1f2e7c95b228c7..7d775ea66cd1e13663ed38df4098e6b49f518a9b 100755 (executable)
--- a/myfai-chboot
+++ b/myfai-chboot
@@ -40,6 +40,5 @@ host=$(./chost faiserver)
 if [[ $host == $(./chost $HOSTNAME) ]]; then
   ./myfai-chboot-local "$@"
 else
-  ssh root@$host bash -s --
-  "$@" <myfai-chboot-local
+  ssh root@$host bash -s -- "$@" <myfai-chboot-local
 fi

diff --git a/wrt-setup-local b/wrt-setup-local
index e043e7dfaf5b7f6b1249b409cdd6eac8e5568e6c..ddf78d6f64a08db91db0a97f2f99b8c8cfdb7692 100755 (executable)
--- a/wrt-setup-local
+++ b/wrt-setup-local
@@ -329,14 +329,10 @@ $l.3 frodo
 $l.4 htpc
 $l.5 x2
 $l.6 demohost
-#$l.7 faiserver
+$l.7 x3
 $l.8 tp faiserver b8.nz
-$l.9 n5
-$l.10 so
-$l.12 fz
 72.14.176.105 li
-45.33.9.11 lj
-138.68.10.24 dopub
+
 # netns creation looks for next free subnet starting at 10.173, but I only
 # use one, and I would keep this one as the first created.
 10.173.0.2 transmission
@@ -424,16 +420,18 @@ dhcp-host=c8:60:00:31:6b:75,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
 dhcp-host=00:1f:16:16:39:24,set:x2,$l.5,x2
-#dhcp-host=00:c0:ca:27:e9:b2,set:x2w,$l.11,x2w
-#wireless interface
-# this is so fai can have an explicit name to use for testing,
+# 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
 # reformatted. The mac is from doing a virt-install, cancelling it,
 # and copying the generated mac, so it should be randomish.
 dhcp-host=52:54:00:9c:ef:ad,set:demohost,$l.6,demohost
-#dhcp-host=52:54:00:56:09:f9,set:faiserver,$l.7,faiserver
+dhcp-host=00:1f:16:14:01:d8,set:tp,$l.7,x3
 dhcp-host=80:fa:5b:1c:6e:cf,set:tp,$l.8,tp
-# this is the ip it picks by default if dhcp fails,
+
+# faiserver vm
+dhcp-host=52:54:00:56:09:f9,set:faiserver,$l.15,faiserver
+
+# This is the ip it picks by default if dhcp fails,
 # so might as well use it.
 # hostname is the name it uses according to telnet
 dhcp-host=b4:75:0e:94:29:ca,set:switch9429ca,$l.251,switch9429ca