From 872e610f6624801ef2b8a70521d08d72620f8eba Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Tue, 29 Jun 2021 11:11:15 +0200
Subject: [PATCH] rootfsinstall.sh: rpi/rpi64: rise boot partition size to
 150M; configure dnf to allow single kernel upgrade before running dnf update

---
 src/rootfsinstall.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/rootfsinstall.sh b/src/rootfsinstall.sh
index 3b1f63a..8f28637 100755
--- a/src/rootfsinstall.sh
+++ b/src/rootfsinstall.sh
@@ -212,7 +212,7 @@ case $TARGETDEVICE in
         ;;
    rpi) ARCH=arm
         BOOTFSTYPE=fat32
-        BOOTFSSIZE=100M
+        BOOTFSSIZE=150M
         BOOTFSSTART=0
         KERNELDEST="@BOOT@/kernel.img"
         KERNELDEST2="@BOOT@/kernel7.img"
@@ -228,7 +228,7 @@ raspberrypi-utils xf86-video-fbturbo $INSTALLPACKAGES"
         ;;
    rpi64) ARCH=aarch64
         BOOTFSTYPE=fat32
-        BOOTFSSIZE=100M
+        BOOTFSSIZE=150M
         BOOTFSSTART=0
         KERNELDEST="@BOOT@/kernel8.img"
         INSTALLPACKAGES="\
@@ -451,6 +451,11 @@ if [ "$SETHOSTNAME" ]; then
    sed -i "s|\(127\.0\.0\.1\W*\)\(.*\)|\1 $SETHOSTNAME.localdomain $SETHOSTNAME localhost.localdomain localhost|" $ROOTMP/etc/hosts
 fi
 
+if [ "$TARGETDEVICE" = "rpi" -o "$TARGETDEVICE" = "rpi64" ]; then
+   echo "protect_running_kernel=False" >> $ROOTMP/etc/dnf/dnf.conf
+   echo "installonlypkgs=\"\"" >> $ROOTMP/etc/dnf/dnf.conf
+fi
+
 if [ "$INSTALLPACKAGES" -a "$LOCALONLY" != "1" -a ! "${IMAGEMODE}" ]; then
    if [ ! -L $ROOTMP/etc/resolv.conf ]; then
       mv $ROOTMP/etc/resolv.conf $ROOTMP/etc/resolv.conf.rootfsinstall
@@ -617,9 +622,6 @@ arm_64bit=1" >> $BOOTMP/config.txt
    #   vlls directory: Additional GPU code, e.g. extra codecs. 
    #                   Not present in the initial release.
 
-   echo "protect_running_kernel=False" >> $ROOTMP/etc/dnf/dnf.conf
-   sed -i "s|installonly_limit=.*|installonly_limit=1|" $ROOTMP/etc/dnf/dnf.conf
-
    [ "$SWHOME" -a "${SWHOME:0:4}" = "/tmp" ] && rm -rf $SWHOME
 
 elif [ "$TARGETDEVICE" = "cubox" ]; then