From db2ca58c3e327f73b64189dec14cf7e7a01b6d34 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Thu, 4 Jul 2019 16:43:16 -0400 Subject: [PATCH] buster and some fixes Time zone wasn't being set. --- fai/config/class/50-host-classes | 4 +--- fai/config/class/FAIBASE.var | 4 ---- fai/config/files/etc/apt/preferences.d/stretch/STRETCH | 4 ++-- fai/config/files/etc/apt/preferences.d/unstable/DEBIAN | 4 ++++ .../{stretch.list => buster.list}/BUSTER_FREE | 3 +++ .../{stretch.list => buster.list}/BUSTER_LINODE | 3 +++ .../{stretch.list => buster.list}/BUSTER_NONFREE | 6 ++++++ fai/config/hooks/partition.DEFAULT | 2 ++ fai/config/package_config/DEBIAN | 10 +++++++--- fai/config/package_config/UBUNTU | 2 +- fai/config/scripts/DEBIAN/10-rootpw | 2 -- fai/config/scripts/GRUB_PC/11-iank | 8 ++++---- mymk-basefile | 2 ++ 13 files changed, 35 insertions(+), 19 deletions(-) rename fai/config/files/etc/apt/sources.list.d/{stretch.list => buster.list}/BUSTER_FREE (76%) rename fai/config/files/etc/apt/sources.list.d/{stretch.list => buster.list}/BUSTER_LINODE (76%) rename fai/config/files/etc/apt/sources.list.d/{stretch.list => buster.list}/BUSTER_NONFREE (69%) diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes index e93bef5..61af5ee 100755 --- a/fai/config/class/50-host-classes +++ b/fai/config/class/50-host-classes @@ -107,12 +107,10 @@ if [[ -e /a/bin/fai/fai-wrapper ]]; then echo "STRETCH_NONFREE" ;; esac - elif isdebian-testing; then - echo "TESTING_NONFREE" fi fi -echo "STANDARD" +echo FAIBASE STANDARD #echo "PARTITION_PROMPT" #echo REPARTITION diff --git a/fai/config/class/FAIBASE.var b/fai/config/class/FAIBASE.var index 3c93b91..324084e 100644 --- a/fai/config/class/FAIBASE.var +++ b/fai/config/class/FAIBASE.var @@ -15,7 +15,3 @@ STOP_ON_ERROR=700 # set parameter for install_packges(8) MAXPACKAGES=800 - -# a user account will be created -username=demo -USERPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1' diff --git a/fai/config/files/etc/apt/preferences.d/stretch/STRETCH b/fai/config/files/etc/apt/preferences.d/stretch/STRETCH index c3b4f51..f3a0d4b 100644 --- a/fai/config/files/etc/apt/preferences.d/stretch/STRETCH +++ b/fai/config/files/etc/apt/preferences.d/stretch/STRETCH @@ -1,5 +1,5 @@ Explanation: tar, cuz https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=819978 -Explanation: kernel & btrfs-tools, because btrfs is getting a lot of active +Explanation: kernel & btrfs-progs, because btrfs is getting a lot of active Explanation: dev, and their mailing list says better to use recent version Explanation: to avoid bugs. linux-base is needed for the kernel, Explanation: which you can find out by failing @@ -8,7 +8,7 @@ Explanation: And then trying aptitude -s install, or Explanation: apt-get -t stretch-backports install linux-image-amd64 Explanation: Explanation: -Package: tar linux-image-amd64 linux-base btrfs-tools +Package: tar linux-image-amd64 linux-base btrfs-progs Pin: release a=stretch-backports Pin-Priority: 500 diff --git a/fai/config/files/etc/apt/preferences.d/unstable/DEBIAN b/fai/config/files/etc/apt/preferences.d/unstable/DEBIAN index 87d6c00..a88edb7 100644 --- a/fai/config/files/etc/apt/preferences.d/unstable/DEBIAN +++ b/fai/config/files/etc/apt/preferences.d/unstable/DEBIAN @@ -17,3 +17,7 @@ Pin-Priority: -20 Package: * Pin: release a=unstable-updates Pin-Priority: -20 + +Package: * +Pin: release a=experimental +Pin-Priority: -40 diff --git a/fai/config/files/etc/apt/sources.list.d/stretch.list/BUSTER_FREE b/fai/config/files/etc/apt/sources.list.d/buster.list/BUSTER_FREE similarity index 76% rename from fai/config/files/etc/apt/sources.list.d/stretch.list/BUSTER_FREE rename to fai/config/files/etc/apt/sources.list.d/buster.list/BUSTER_FREE index be9c7e3..2d2d737 100644 --- a/fai/config/files/etc/apt/sources.list.d/stretch.list/BUSTER_FREE +++ b/fai/config/files/etc/apt/sources.list.d/buster.list/BUSTER_FREE @@ -9,3 +9,6 @@ deb-src http://http.us.debian.org/debian buster-updates main deb http://http.debian.net/debian buster-backports main deb-src http://http.debian.net/debian buster-backports main + +deb http://http.us.debian.org/debian unstable main contrib non-free +deb-src http://http.us.debian.org/debian unstable main contrib non-free diff --git a/fai/config/files/etc/apt/sources.list.d/stretch.list/BUSTER_LINODE b/fai/config/files/etc/apt/sources.list.d/buster.list/BUSTER_LINODE similarity index 76% rename from fai/config/files/etc/apt/sources.list.d/stretch.list/BUSTER_LINODE rename to fai/config/files/etc/apt/sources.list.d/buster.list/BUSTER_LINODE index 1d91060..38f7cbf 100644 --- a/fai/config/files/etc/apt/sources.list.d/stretch.list/BUSTER_LINODE +++ b/fai/config/files/etc/apt/sources.list.d/buster.list/BUSTER_LINODE @@ -9,3 +9,6 @@ deb-src http://mirrors.linode.com/debian/ buster-updates main deb http://mirrors.linode.com/debian/ buster-backports main deb-src http://mirrors.linode.com/debian/ buster-backports main + +deb http://http.us.debian.org/debian unstable main contrib non-free +deb-src http://http.us.debian.org/debian unstable main contrib non-free diff --git a/fai/config/files/etc/apt/sources.list.d/stretch.list/BUSTER_NONFREE b/fai/config/files/etc/apt/sources.list.d/buster.list/BUSTER_NONFREE similarity index 69% rename from fai/config/files/etc/apt/sources.list.d/stretch.list/BUSTER_NONFREE rename to fai/config/files/etc/apt/sources.list.d/buster.list/BUSTER_NONFREE index f85a6fe..fc58c98 100644 --- a/fai/config/files/etc/apt/sources.list.d/stretch.list/BUSTER_NONFREE +++ b/fai/config/files/etc/apt/sources.list.d/buster.list/BUSTER_NONFREE @@ -9,3 +9,9 @@ deb-src http://http.us.debian.org/debian buster-updates main contrib non-free deb http://http.debian.net/debian buster-backports main contrib non-free deb-src http://http.debian.net/debian buster-backports main contrib non-free + +deb http://http.us.debian.org/debian unstable main contrib non-free +deb-src http://http.us.debian.org/debian unstable main contrib non-free + +deb http://http.us.debian.org/debian experimental main +deb-src http://http.us.debian.org/debian experimental main diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT index c637a9b..b10ef25 100755 --- a/fai/config/hooks/partition.DEFAULT +++ b/fai/config/hooks/partition.DEFAULT @@ -254,6 +254,8 @@ if [[ ! $DISTRO ]]; then DISTRO=debianstretch_bootstrap elif ifclass VOL_STRETCH; then DISTRO=debianstretch + elif ifclass VOL_BUSTER; then + DISTRO=debianbuster elif ifclass VOL_TESTING; then DISTRO=debiantesting elif ifclass VOL_XENIAL; then diff --git a/fai/config/package_config/DEBIAN b/fai/config/package_config/DEBIAN index 7543ae7..31072d3 100644 --- a/fai/config/package_config/DEBIAN +++ b/fai/config/package_config/DEBIAN @@ -12,9 +12,13 @@ console-setup kbd pciutils usbutils unattended-upgrades -PACKAGES install STRETCH +PACKAGES install STRETCH BUSTER apt-transport-https +# otherwise sshd takes like 10 seconds to start +PACKAGES install BUSTER +haveged + PACKAGES install NONFREE # you may want these non-free kernel drivers firmware-bnx2 firmware-bnx2x firmware-realtek @@ -43,10 +47,10 @@ linux-image-arm64 # 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 +grub-pc cryptsetup btrfs-progs mbuffer sudo bridge-utils netcat-openbsd resolvconf lsof PACKAGES install GRUB_EFI -grub-efi cryptsetup btrfs-tools mbuffer sudo bridge-utils netcat-openbsd resolvconf lsof +grub-efi cryptsetup btrfs-progs mbuffer sudo bridge-utils netcat-openbsd resolvconf lsof PACKAGES install LVM diff --git a/fai/config/package_config/UBUNTU b/fai/config/package_config/UBUNTU index a2de98e..327fa28 100644 --- a/fai/config/package_config/UBUNTU +++ b/fai/config/package_config/UBUNTU @@ -25,7 +25,7 @@ memtest86+ # duplicated in DEBIAN PACKAGES install GRUB_PC -grub-pc cryptsetup btrfs-tools mbuffer sudo bridge-utils netcat-openbsd resolvconf lsof +grub-pc cryptsetup btrfs-progs mbuffer sudo bridge-utils netcat-openbsd resolvconf lsof PACKAGES install FLIDAS64 XENIAL64 diff --git a/fai/config/scripts/DEBIAN/10-rootpw b/fai/config/scripts/DEBIAN/10-rootpw index bb77d1a..7a7f617 100755 --- a/fai/config/scripts/DEBIAN/10-rootpw +++ b/fai/config/scripts/DEBIAN/10-rootpw @@ -7,8 +7,6 @@ if [ -n "$ROOTPW" ]; then $ROOTCMD usermod -p "$ROOTPW" root else $ROOTCMD usermod -L root - # enable sudo for user - ainsl /etc/sudoers "$username ALL = ALL" fi exit $error diff --git a/fai/config/scripts/GRUB_PC/11-iank b/fai/config/scripts/GRUB_PC/11-iank index d7534d5..3bb65ea 100755 --- a/fai/config/scripts/GRUB_PC/11-iank +++ b/fai/config/scripts/GRUB_PC/11-iank @@ -27,9 +27,9 @@ EOFOUTER # -r = recursive # -i = ignore non-matching class warnings, always exit 0 # -B = no backup files -fcopy -riB /boot +fcopy -riBM /boot # this is also done by FABASE/10-misc by default. -fcopy -riB /root +fcopy -riBM /root src=$FAI/distro-install-common/shadow @@ -42,7 +42,7 @@ fi $FAI/distro-install-common/end if ifclass VOL_STRETCH_BOOTSTRAP; then - fcopy -ri /etc/systemd/system + fcopy -riM /etc/systemd/system chroot $FAI_ROOT bash <<'EOFOUTER' systemctl enable fai_check.service EOFOUTER @@ -52,7 +52,7 @@ fi # 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 +fcopy -riBM /etc/apt # outside of fai, this seems to regularly lead to # E: Could not get lock /var/lib/apt/lists/lock - open (11: Resource temporarily unavailable) # so add a sleep. 1 sec is probably way more than needed. diff --git a/mymk-basefile b/mymk-basefile index e70f97b..d2b4328 100755 --- a/mymk-basefile +++ b/mymk-basefile @@ -16,8 +16,10 @@ them often. Better to build our all our own. Args I've used before: +-z BUSTER64 -z STRETCH64 -z XENIAL64 +-z ETIONA64 -z FLIDAS64 -z BELENOS64 -- 2.30.2