From patchwork Fri Jul 28 16:04:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Fitzenreiter X-Patchwork-Id: 7030 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4RCCBf21xvz3wfV for ; Fri, 28 Jul 2023 16:04:42 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4RCCBc5WjNzfG; Fri, 28 Jul 2023 16:04:40 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4RCCBc4gZkz2yjS; Fri, 28 Jul 2023 16:04:40 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4RCCBZ6tM6z2xQl for ; Fri, 28 Jul 2023 16:04:38 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4RCCBV3Yw6zZb; Fri, 28 Jul 2023 16:04:34 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1690560277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=5lJE4OOcmE+CgTGv4DQzaxpY3X6+b9WKyfsEozcOO5s=; b=Autd5mHa8LiMiILCnxc0Ce7AALmh+buJixQdr7ZCnvDvZCwWfjf85dPN1D+2D/ybdViu3O YhHO1v6+OM2N9GBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1690560277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=5lJE4OOcmE+CgTGv4DQzaxpY3X6+b9WKyfsEozcOO5s=; b=pBXEnAgllATFpAOw6NKP+kztgJkCYIInkBoFnVGcZwCd6B+6GnuyZcN1ygKMt6sALpz0YA mfk4gBV3GiQ0MTooRbf5qXAxV2mBC/n6EK+1KdoEUvZaZa3o1XOWGxJIGpwK/lHshRpOxz +fLx7DM3g12At/v/zf37YSSLFzuvsDrSrcfwKnf4dr9RVpa6E2HpmyK5saztn7Nz++h8oi wRjqW/qF0lbOf+rp+19ps2QrhZfIxqsTP1UqEmEvF6ZMF8mBq6+NqUIvcGccRWaOb8ka+r 5oWAXb4dU3++QtU9y7BnE+vVRpSSQDKVHNA9NfPVEK/9+7Bt0uOrYp1mzUNXoQ== From: Arne Fitzenreiter To: development@lists.ipfire.org Subject: [PATCH] initskripts: remove buggy remount at halt and reboot Date: Fri, 28 Jul 2023 18:04:25 +0200 Message-Id: <20230728160425.9236-1-arne_f@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arne Fitzenreiter Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 --- 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