Merge branch 'core188'

This commit is contained in:
Michael Tremer
2024-09-20 12:26:22 +00:00
3 changed files with 9 additions and 4 deletions

View File

@@ -0,0 +1 @@
../../../../common/aarch64/u-boot

View File

@@ -121,12 +121,16 @@ ldconfig
/etc/init.d/apache restart /etc/init.d/apache restart
/etc/init.d/unbound restart /etc/init.d/unbound restart
# Regenerate Suricata rule files
perl -e "require '/var/ipfire/ids-functions.pl'; &IDS::write_used_rulefiles_file();"t
/etc/init.d/suricata reload
# Build initial ramdisks # Build initial ramdisks
dracut --regenerate-all --force dracut --regenerate-all --force
KVER="xxxKVERxxx" KVER="xxxKVERxxx"
case "$(uname -m)" in case "$(uname -m)" in
aarch64) aarch64)
mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}.img /boot/uInit-${KVER}
# dont remove initramfs because grub need this to boot. # dont remove initramfs because grub need this to boot.
;; ;;
esac esac

View File

@@ -77,8 +77,8 @@ else
fi; fi;
setenv fdt_high ffffffff; setenv fdt_high ffffffff;
fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}-ipfire${kernel_type}; fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER};
fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}-ipfire${kernel_type}/${fdtfile}; fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}/${fdtfile};
if test "${FDTCMDS}" = ""; then if test "${FDTCMDS}" = ""; then
echo ; echo ;
@@ -88,7 +88,7 @@ else
fi; fi;
setenv ramdisk_addr ${ramdisk_addr_r} setenv ramdisk_addr ${ramdisk_addr_r}
if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire${kernel_type}; then if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}; then
echo Ramdisk loaded...; echo Ramdisk loaded...;
else else
echo Ramdisk not loaded...; echo Ramdisk not loaded...;