initskripts: remove buggy remount at halt and reboot

mount -f does nothing and also the sync calls should do nothing
on a already ro mounted filesystem.

fixes: #13195

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/177/filelists/files b/config/rootfiles/core/177/filelists/files
index e9ba30a0cf802a81caaa667e95e4f053f8dd86aa..5f0034d81d53ddd35fc2c5355402a2b65f137a46 100644 (file)
--- a/config/rootfiles/core/177/filelists/files
+++ b/config/rootfiles/core/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/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