initskripts: remove buggy remount at halt and reboot

Message ID 20230728160425.9236-1-arne_f@ipfire.org
State Accepted
Commit 0bb82a95dd383912bde857db9a7d702604e582f6
Headers
Series initskripts: remove buggy remount at halt and reboot |

Commit Message

Arne Fitzenreiter July 28, 2023, 4:04 p.m. UTC
  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>
---
 config/rootfiles/core/177/filelists/files | 2 ++
 src/initscripts/system/halt               | 5 -----
 src/initscripts/system/reboot             | 4 ----
 3 files changed, 2 insertions(+), 9 deletions(-)
  

Patch

diff --git a/config/rootfiles/core/177/filelists/files b/config/rootfiles/core/177/filelists/files
index e9ba30a0c..5f0034d81 100644
--- 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 91c89455c..40a72ac7d 100644
--- 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 30c504025..f87f12921 100644
--- 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