buster and some fixes

Time zone wasn't being set.

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index e93bef5f08270085739b96a55aa0a8688bea4148..61af5ee37ab26213190ca05179f69e2205461826 100755 (executable)
--- 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 3c93b91dc850c770437ca49b50d63f678a85b861..324084eeea1a3d5c75c980a9ee25552b604617c0 100644 (file)
--- 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 c3b4f5194c3b29125f094741b685239458907784..f3a0d4bb00aad9492935eddb726cfe5171b81863 100644 (file)
--- 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 87d6c00f956a08fb61e6b3188e65bfc0ad49f16e..a88edb765b30b7d1a79123fc57716df9b286c927 100644 (file)
--- 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 be9c7e30c86906e4398937d9133c9ace547fa673..2d2d73754a1e91f88366af73191a6f43e335858e 100644 (file)
--- 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 1d910606fe4f558060203eda80e88b6e4d0c0f3a..38f7cbfe2278810b7f8a86267d166dcc99991003 100644 (file)
--- 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 f85a6fe23bb920396e85c3a5f280a2165bc73c8c..fc58c9819914e141cfea7cb979855b339dc24f52 100644 (file)
--- 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 c637a9bcf6e1c71b00bd4c3fa91a3b7dced02afd..b10ef25405d3e75b0a6b16e4d33d1f6d2e0665c8 100755 (executable)
--- 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 7543ae771b2243746a821691a15438d5d80ae5f2..31072d33331855ed76134fdd8d1613fcd018b820 100644 (file)
--- 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 a2de98e5a82f66b6bfdce1da53dc597a06e0e1e8..327fa283370d2ad01a061a4feb4c2ba5068f76e4 100644 (file)
--- 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 bb77d1a30f5fe0eb2df8dc43d5abbfc8b80dcdb3..7a7f6177a30e398311f8b1659f61114487947767 100755 (executable)
--- 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 d7534d5551ceb462ced9b8f4815022adf0f4b526..3bb65ea27aa8d5c1bb1ff3c5bf6cee8c6ea67810 100755 (executable)
--- 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 e70f97b14e34999d3b0f00d13c95b954aad227df..d2b4328792fd3f53129c80dc6093f164e6cb796f 100755 (executable)
--- 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