openmamba/usbinstall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rootfsinstall.sh: rpi/rpi64: rise boot partition size to 150M; configure dnf to allow single kernel upgrade before running dnf update

Browse Source
This commit is contained in:
Silvan Calarco 2021-06-29 11:11:15 +02:00
parent f58045a760
commit 872e610f66
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/rootfsinstall.sh
View File

@ -212,7 +212,7 @@ case $TARGETDEVICE in
;; ;;
rpi) ARCH=arm rpi) ARCH=arm
BOOTFSTYPE=fat32 BOOTFSTYPE=fat32
BOOTFSSIZE=100M BOOTFSSIZE=150M
BOOTFSSTART=0 BOOTFSSTART=0
KERNELDEST="@BOOT@/kernel.img" KERNELDEST="@BOOT@/kernel.img"
KERNELDEST2="@BOOT@/kernel7.img" KERNELDEST2="@BOOT@/kernel7.img"
@ -228,7 +228,7 @@ raspberrypi-utils xf86-video-fbturbo $INSTALLPACKAGES"
;; ;;
rpi64) ARCH=aarch64 rpi64) ARCH=aarch64
BOOTFSTYPE=fat32 BOOTFSTYPE=fat32
BOOTFSSIZE=100M BOOTFSSIZE=150M
BOOTFSSTART=0 BOOTFSSTART=0
KERNELDEST="@BOOT@/kernel8.img" KERNELDEST="@BOOT@/kernel8.img"
INSTALLPACKAGES="\ 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 sed -i "s|\(127\.0\.0\.1\W*\)\(.*\)|\1 $SETHOSTNAME.localdomain $SETHOSTNAME localhost.localdomain localhost|" $ROOTMP/etc/hosts
fi 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 [ "$INSTALLPACKAGES" -a "$LOCALONLY" != "1" -a ! "${IMAGEMODE}" ]; then
if [ ! -L $ROOTMP/etc/resolv.conf ]; then if [ ! -L $ROOTMP/etc/resolv.conf ]; then
mv $ROOTMP/etc/resolv.conf $ROOTMP/etc/resolv.conf.rootfsinstall 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. # vlls directory: Additional GPU code, e.g. extra codecs.
# Not present in the initial release. # 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 [ "$SWHOME" -a "${SWHOME:0:4}" = "/tmp" ] && rm -rf $SWHOME
elif [ "$TARGETDEVICE" = "cubox" ]; then elif [ "$TARGETDEVICE" = "cubox" ]; then