From: Ian Kelling <iank@fsf.org>
Date: Tue, 13 Jul 2021 21:44:26 +0000 (-0400)
Subject: nabia has a kernel now. other minor fixes
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=0c400e34881621fa39a4d0bbf4403209e81efcfa;p=automated-distro-installer

nabia has a kernel now. other minor fixes
---

diff --git a/fai-revm b/fai-revm
index 1b9897e..0d117e6 100755
--- a/fai-revm
+++ b/fai-revm
@@ -149,6 +149,9 @@ for ((i=1; i <= disk_count; i++)); do
   disk_arg+=("--disk path=$f")
   if $new_disk || [[ ! -e $f ]]; then
     sudo rm -f $f
+    # https://btrfs.wiki.kernel.org/index.php/FAQ
+    sudo touch $f
+    chattr +C $f
     e sudo qemu-img create -o preallocation=metadata -f qcow2 $f 50G
   fi
 done
diff --git a/fai/config/files/etc/apt/preferences.d/nabia-focal/NABIA b/fai/config/files/etc/apt/preferences.d/nabia-focal/NABIA
index 22eb565..1e6fc34 100644
--- a/fai/config/files/etc/apt/preferences.d/nabia-focal/NABIA
+++ b/fai/config/files/etc/apt/preferences.d/nabia-focal/NABIA
@@ -1,7 +1,3 @@
 Package: *
 Pin: release n=focal,o=Ubuntu
 Pin-Priority: -100
-
-Package: linux-image-* linux-modules-* linux-firmware intel-microcode amd64-microcode
-Pin: release n=focal,o=Ubuntu
-Pin-Priority: 500
diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index 0dc4c7d..f98e595 100755
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -361,8 +361,8 @@ if (( boot_space > 60000 )); then
   # recovery needs and for doing pxe-kexec.
   boot_mib=10000
   root2_mib=200000
-  boot2_mib=500
-elif (( boot_space > 30000 )); then
+  boot2_mib=2000
+elif (( boot_spa_ce > 30000 )); then
   boot_mib=$(( 5000 + (boot_space - 30000) / 2 ))
   root2_mib=100
   boot2_mib=100
@@ -474,6 +474,9 @@ for dev in ${devs[@]}; do
 done
 shopt -s nullglob
 
+# We write to these files instead of just /etc/fstab, /etc/crypttab,
+# because these are filesystems created after our current root, and so
+# this allows us to update other root filesystems too.
 rm -f /mnt/root/root2-{fs,crypt}tab
 if $mkroot2; then
   if $partition; then
diff --git a/fai/config/package_config/UBUNTU b/fai/config/package_config/UBUNTU
index 02f852d..e672026 100644
--- a/fai/config/package_config/UBUNTU
+++ b/fai/config/package_config/UBUNTU
@@ -13,5 +13,9 @@ memtest86+
 PACKAGES install FLIDAS64 XENIAL64
 linux-image-generic-hwe-8.0
 
+PACKAGES install NABIA64 FOCAL64
+linux-image-generic-
+linux-image-generic-hwe-20.04
+
 PACKAGES install GERMAN
 language-pack-gnome-de