From nobody Thu Jul 21 05:52:40 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LpMD83Ztwz4WkZn; Thu, 21 Jul 2022 05:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LpMD82p48z3MNG; Thu, 21 Jul 2022 05:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658382760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T7aA3UcXi1B0hWYri333VENutcZGHDt3vIAPve3oQp8=; b=dMhOH6z0N/dAmipviyLEhKlAdg6RirQi1Ii/r+9Up7tpLkks0xsxEAE3E+brMI/P0wGjrj FKZmRb8DO8/I6jOpP3S1DLez29lAmnGD50BdRlGpd6aibUvw9xZ/hh0tBWoe2J/nEIDk7e wszEbV8YJhkvPiBkeqCO6hVdhpIXMNxrkkC1Oqw4AA8TBH+hhc9HCCiYeZXlkG6w6tA2Hy kR6wqut7Yt3l9F8/IHVVMG06j2a9nH1BX7fgqBMEr+23VgXIbHcNUi14+SDpKy0HYlSqu7 JVPvm420Cq65MFXkGUSDU9ETiAfM9DzY3p8mjK9nSuLh+NKXkOfZ9DV2eXfttQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LpMD81mppz1Q3k; Thu, 21 Jul 2022 05:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26L5qe2W065900; Thu, 21 Jul 2022 05:52:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26L5qelb065899; Thu, 21 Jul 2022 05:52:40 GMT (envelope-from git) Date: Thu, 21 Jul 2022 05:52:40 GMT Message-Id: <202207210552.26L5qelb065899@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 7c332e97bbd3 - main - Ask to look for alternate UFS2 superblocks when the standard one is unusable. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c332e97bbd3a90152c3c37d4fb259c2648f1298 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658382760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T7aA3UcXi1B0hWYri333VENutcZGHDt3vIAPve3oQp8=; b=lzqlvpqDLqrLZyW/0PDkVwt1wLW1Qky1/86jrhBImjh/BE1xRitmCefG4qoxSqB5EREwDN yq6TofOXQtsTKs/yW/3GCcset26DTRH7appvOxG+rwQEmVgU3GgOvauMXW/TpVWVnlM+D1 ow38Xl0p5oA2qWbPsa5IqH3QZHW8zAGKyBF4jCLMbVw/zYBSLPvXSKCMd0sZDo5wcd1qUq FDr8rM+CjN3bGgJWK3nFwouBljBkapISqKa9LL1d3BBIRwbGLzbVmKWwzRvdmGpfUUMUTH kok9gYoXsXBDXCzD6lHqiHVxLVXOweh9zQJvY6crGPJoOseO57gR00DTqGN35A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658382760; a=rsa-sha256; cv=none; b=Y69qUKkMI40A91Nzyp9ZSX8wDJUu+RgXox2Ps2I8RruP7Go1FkOMQHqpjvbZ7a0QqiZb2v dwRDEOZk7AUIjkjqwYSwtZOeiTLkFJ3RGyekIcKJMZEYC+h0LILoYOQT/TFd2zKWndV57j rfHT9UbKs2OmAG+Dbhtf+/BPCkfJFqARFmpoaqXUEscYuHrGEPqYj805JVwE1gmWeyi976 tVQsIEHCX3eZCRZCO41Zr1Qa7I7LCvAGWUi/GySQ+caP/f7n/swiAhcAqQZAKU/rIzZUmY tuXLkL2zZIni8ykc+UpELX3hh8tsynisOVh1uY/HJy/smENz0oqb2T8azf0z5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=7c332e97bbd3a90152c3c37d4fb259c2648f1298 commit 7c332e97bbd3a90152c3c37d4fb259c2648f1298 Author: Kirk McKusick AuthorDate: 2022-07-21 05:37:14 +0000 Commit: Kirk McKusick 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);