Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Jul 2022 05:52:40 GMT
From:      Kirk McKusick <mckusick@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 7c332e97bbd3 - main - Ask to look for alternate UFS2 superblocks when the standard one is unusable.
Message-ID:  <202207210552.26L5qelb065899@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by mckusick:

URL: https://cgit.FreeBSD.org/src/commit/?id=7c332e97bbd3a90152c3c37d4fb259c2648f1298

commit 7c332e97bbd3a90152c3c37d4fb259c2648f1298
Author:     Kirk McKusick <mckusick@FreeBSD.org>
AuthorDate: 2022-07-21 05:37:14 +0000
Commit:     Kirk McKusick <mckusick@FreeBSD.org>
CommitDate: 2022-07-21 05:52:10 +0000

    Ask to look for alternate UFS2 superblocks when the standard one is unusable.
    
    This feature was inadvertently lost in commit c0bfa109b942.
---
 sbin/fsck_ffs/fsutil.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c
index 711c9bb63549..424f8d9794f6 100644
--- a/sbin/fsck_ffs/fsutil.c
+++ b/sbin/fsck_ffs/fsutil.c
@@ -129,7 +129,8 @@ reply(const char *question)
 
 	if (preen)
 		pfatal("INTERNAL ERROR: GOT TO reply()");
-	persevere = !strcmp(question, "CONTINUE");
+	persevere = strcmp(question, "CONTINUE") == 0 ||
+		strcmp(question, "LOOK FOR ALTERNATE SUPERBLOCKS") == 0;
 	printf("\n");
 	if (!persevere && (nflag || (fswritefd < 0 && bkgrdflag == 0))) {
 		printf("%s? no\n\n", question);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207210552.26L5qelb065899>