This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via cc51ff1468a6ee595fcf425a60ea3da9beac9c3d (commit) via 1abba4e952ad107d1488493ef81cde3623db963d (commit) via edb9e4e030b3bb8a85bbca36308c14278077ecb7 (commit) via 699124028a4a08c9b07de9348df37fa2950afe15 (commit) from 4913a44798caa0a190aef6cfced766e713ea260a (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit cc51ff1468a6ee595fcf425a60ea3da9beac9c3d Merge: 4913a44798 1abba4e952 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 20 12:26:22 2024 +0000

Merge branch 'core188'

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/oldcore/{159 => 188}/filelists/aarch64/u-boot | 0 config/rootfiles/oldcore/188/update.sh | 6 +++++- config/u-boot/boot.cmd | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) copy config/rootfiles/oldcore/{159 => 188}/filelists/aarch64/u-boot (100%)

Difference in files: diff --git a/config/rootfiles/oldcore/188/filelists/aarch64/u-boot b/config/rootfiles/oldcore/188/filelists/aarch64/u-boot new file mode 120000 index 0000000000..2a16bdbfe2 --- /dev/null +++ b/config/rootfiles/oldcore/188/filelists/aarch64/u-boot @@ -0,0 +1 @@ +../../../../common/aarch64/u-boot \ No newline at end of file diff --git a/config/rootfiles/oldcore/188/update.sh b/config/rootfiles/oldcore/188/update.sh index 2762230522..d15ca96744 100644 --- a/config/rootfiles/oldcore/188/update.sh +++ b/config/rootfiles/oldcore/188/update.sh @@ -121,12 +121,16 @@ ldconfig /etc/init.d/apache 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 dracut --regenerate-all --force KVER="xxxKVERxxx" case "$(uname -m)" in 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. ;; esac diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd index a279967803..5faa3a1eca 100644 --- a/config/u-boot/boot.cmd +++ b/config/u-boot/boot.cmd @@ -77,8 +77,8 @@ else fi;

setenv fdt_high ffffffff; -fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}-ipfire${kernel_type}; -fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}-ipfire${kernel_type}/${fdtfile}; +fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}; +fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}/${fdtfile};

if test "${FDTCMDS}" = ""; then echo ; @@ -88,7 +88,7 @@ else fi;

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...; else echo Ramdisk not loaded...;

hooks/post-receive -- IPFire 2.x development tree