Merge branch 'master' into next

diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index 32fcb18c4f2813be892ec047a2b05b556de39ebb..a5ad9700f537b055b971ad9958a5ac1c53dd232e 100644 (file)
--- a/config/kernel/kernel.config.x86_64-ipfire
+++ b/config/kernel/kernel.config.x86_64-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.41-ipfire Kernel Configuration
+# Linux/x86 6.1.42-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0"
 CONFIG_CC_IS_GCC=y

diff --git a/config/rootfiles/oldcore/177/filelists/files b/config/rootfiles/oldcore/177/filelists/files
index e9ba30a0cf802a81caaa667e95e4f053f8dd86aa..5f0034d81d53ddd35fc2c5355402a2b65f137a46 100644 (file)
--- a/config/rootfiles/oldcore/177/filelists/files
+++ b/config/rootfiles/oldcore/177/filelists/files
@@ -1,3 +1,5 @@
+etc/rc.d/init.d/halt
+etc/rc.d/init.d/reboot
 lib/firmware/amd-ucode/microcode_amd_fam17h.bin
 lib/firmware/amd-ucode/microcode_amd_fam19h.bin
 lib/firmware/amdgpu/aldebaran_mec2.bin

diff --git a/config/rootfiles/oldcore/177/update.sh b/config/rootfiles/oldcore/177/update.sh
index 81807994057f268221aa7de656a8a90a6af764c4..52ef205b0930bb4f8a0e99fec4a9272c8798c3ec 100644 (file)
--- a/config/rootfiles/oldcore/177/update.sh
+++ b/config/rootfiles/oldcore/177/update.sh
@@ -97,6 +97,15 @@ rm -f \
        /opt/pakfire/db/meta/meta-squidclamav \
        /opt/pakfire/db/rootfiles/squidclamav
 
+# remove old rngd if the addon is not installed
+if [ ! -e "/opt/pakfire/db/installed/meta-rng-tools" ]; then
+       rm -fv /usr/bin/randstat \
+               /usr/bin/rngtest \
+               /usr/sbin/rngd \
+               /etc/rc.d/init.d/rngd \
+               /etc/rc.d/rc?.d/*rngd
+fi
+
 # Extract files
 extract_files
 

diff --git a/lfs/linux b/lfs/linux
index 4aa8c08cb327ef248f69e3c1336b57961fedd4bb..2160482ca58d387092cde878238a6ccd58c69968 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@
 
 include Config
 
-VER         = 6.1.41
+VER         = 6.1.42
 ARM_PATCHES = 6.1.y-ipfire2
 
 THISAPP    = linux-$(VER)
@@ -75,7 +75,7 @@ objects = \
 $(DL_FILE)                                     = $(URL_IPFIRE)/$(DL_FILE)
 arm-multi-patches-$(ARM_PATCHES).patch.xz      = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
 
-$(DL_FILE)_BLAKE2 = 7b67b16cb45e8089a4554c59e5be29fef39acd95013345752f5e57af4f185cc79a5effb13741f643d7a9ef2c99555342cfeb1e859f38303be800d889a35972fe
+$(DL_FILE)_BLAKE2 = 27d506867a44764ca5fb71d36a1732ded064b8d24d2d53bd1b2158db53cc82283a390b46071ed0cd07fdd68a0fd60486e5ec231fc6247f87bc0bea9692d449f9
 arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 7afc460562fb24bcd75784fc79de768f9b60780aedd88d1a847927169e31920bbb475b1ac1466c4a224a7876d16bd8d465b96202de12b74f6e2ccbfcec731ad3
 
 install : $(TARGET)

diff --git a/src/initscripts/system/halt b/src/initscripts/system/halt
index 91c89455ce1cabbc9a37934171e7de3932b41a3b..40a72ac7da1453fdac5685c2a27d04db751dc1f9 100644 (file)
--- a/src/initscripts/system/halt
+++ b/src/initscripts/system/halt
@@ -24,11 +24,6 @@
 
 case "${1}" in
        stop)
-               sync && sync
-               boot_mesg "Remount root readonly..."
-               mount -f -o remount,ro / > /dev/null 2>&1
-               evaluate_retval
-
                boot_mesg "Prepare for halt..."
                sleep 2
 

diff --git a/src/initscripts/system/reboot b/src/initscripts/system/reboot
index 30c5040258e95d02ae85041e55a501f292e3ff44..f87f1292190c43b984996483bc0bca2637f1dc46 100644 (file)
--- a/src/initscripts/system/reboot
+++ b/src/initscripts/system/reboot
@@ -24,10 +24,6 @@
 
 case "${1}" in
        stop)
-               sync && sync
-               boot_mesg "Remount root readonly..."
-               mount -f -o remount,ro / > /dev/null 2>&1
-               evaluate_retval
                boot_mesg "Prepare for reboot..."
                sleep 2
                reboot -d -f -i