From: Gerald Yang <gerald.yang@canonical.com>
To: djwong@kernel.org, sandeen@sandeen.net
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH] fsck.xfs: fix fsck.xfs run by different shells when fsck.mode=force is set
Date: Tue, 13 Aug 2024 15:25:51 +0800 [thread overview]
Message-ID: <20240813072815.1655916-1-gerald.yang@canonical.com> (raw)
When fsck.mode=force is specified in the kernel command line, fsck.xfs
is executed during the boot process. However, when the default shell is
not bash, $PS1 should be a different value, consider the following script:
cat ps1.sh
echo "$PS1"
run ps1.sh with different shells:
ash ./ps1.sh
$
bash ./ps1.sh
dash ./ps1.sh
$
ksh ./ps1.sh
zsh ./ps1.sh
On systems like Ubuntu, where dash is the default shell during the boot
process to improve startup speed. This results in FORCE being incorrectly
set to false and then xfs_repair is not invoked:
if [ -n "$PS1" -o -t 0 ]; then
FORCE=false
fi
Other distros may encounter this issue too if the default shell is set
to anoother shell.
Check "-t 0" is enough to determine if we are in interactive mode, and
xfs_repair is invoked as expected regardless of the shell used.
Fixes: 04a2d5dc ("fsck.xfs: allow forced repairs using xfs_repair")
Signed-off-by: Gerald Yang <gerald.yang@canonical.com>
---
fsck/xfs_fsck.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fsck/xfs_fsck.sh b/fsck/xfs_fsck.sh
index 62a1e0b3..19ada9a7 100755
--- a/fsck/xfs_fsck.sh
+++ b/fsck/xfs_fsck.sh
@@ -55,12 +55,12 @@ fi
# directly.
#
# Use multiple methods to capture most of the cases:
-# The case for *i* and -n "$PS1" are commonly suggested in bash manual
+# The case for *i* is commonly suggested in bash manual
# and the -t 0 test checks stdin
case $- in
*i*) FORCE=false ;;
esac
-if [ -n "$PS1" -o -t 0 ]; then
+if [ -t 0 ]; then
FORCE=false
fi
--
2.43.0
next reply other threads:[~2024-08-13 7:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-13 7:25 Gerald Yang [this message]
2024-08-13 14:53 ` [PATCH] fsck.xfs: fix fsck.xfs run by different shells when fsck.mode=force is set Darrick J. Wong
2024-09-06 3:44 ` Gerald Yang
2024-09-06 13:34 ` Carlos Maiolino
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=20240813072815.1655916-1-gerald.yang@canonical.com \
--to=gerald.yang@canonical.com \
--cc=djwong@kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/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