From 2e762b02521c8d189f568ddf14cda025e40bb1ef Mon Sep 17 00:00:00 2001
From: Kirk McKusick <mckusick@FreeBSD.org>
Date: Mon, 26 Apr 2021 18:42:48 -0700
Subject: [PATCH] Clean up fsck_ffs error message output.

(cherry picked from commit 689724cb23c2acf58091c80f27de4823d7cd87ca)

Sponsored by: Netflix
---
 sbin/fsck_ffs/fsutil.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c
index 276d543dedc..b13ba4c54bd 100644
--- a/sbin/fsck_ffs/fsutil.c
+++ b/sbin/fsck_ffs/fsutil.c
@@ -948,6 +948,7 @@ check_cgmagic(int cg, struct bufarea *cgbp, int request_rebuild)
 {
 	struct cg *cgp = cgbp->b_un.b_cg;
 	uint32_t cghash, calchash;
+	static int prevfailcg = -1;
 
 	/*
 	 * Extended cylinder group checks.
@@ -973,9 +974,14 @@ check_cgmagic(int cg, struct bufarea *cgbp, int request_rebuild)
 	      cgp->cg_initediblk <= sblock.fs_ipg))) {
 		return (1);
 	}
-	pfatal("CYLINDER GROUP %d: INTEGRITY CHECK FAILED", cg);
-	if (!request_rebuild)
+	if (prevfailcg == cg)
 		return (0);
+	prevfailcg = cg;
+	pfatal("CYLINDER GROUP %d: INTEGRITY CHECK FAILED", cg);
+	if (!request_rebuild) {
+		printf("\n");
+		return (0);
+	}
 	if (!reply("REBUILD CYLINDER GROUP")) {
 		printf("YOU WILL NEED TO RERUN FSCK.\n");
 		rerun = 1;