public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
From: Arne Fitzenreiter <arne_f@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] initskripts: remove buggy remount at halt and reboot
Date: Fri, 28 Jul 2023 18:04:25 +0200	[thread overview]
Message-ID: <20230728160425.9236-1-arne_f@ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 1679 bytes --]

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(a)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(-)

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
-- 
2.38.1


                 reply	other threads:[~2023-07-28 16:04 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230728160425.9236-1-arne_f@ipfire.org \
    --to=arne_f@ipfire.org \
    --cc=development@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox