From f26c5d66d11fc97c3c6a17a3647dad5d1922fe5a Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Fri, 29 Mar 2019 13:31:06 -0400 Subject: [PATCH] fix some bugs and mix other things --- fai/config/package_config/DEBIAN | 28 +++++++--------------------- fai/config/package_config/UBUNTU | 20 ++++++++++++++++++-- myfai-chboot | 3 +-- wrt-setup-local | 20 +++++++++----------- 4 files changed, 35 insertions(+), 36 deletions(-) diff --git a/fai/config/package_config/DEBIAN b/fai/config/package_config/DEBIAN index 1c7cc73..7543ae7 100644 --- 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 7f25a3a..81670da 100644 --- 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 2d6b527..7d775ea 100755 --- 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 -- - "$@"