From owner-dev-commits-src-main@freebsd.org Sat Jan 16 06:08:03 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B41924D4CE8; Sat, 16 Jan 2021 06:08:03 +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 4DHnfC4p2Jz4tSq; Sat, 16 Jan 2021 06:08:03 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 97A74228F; Sat, 16 Jan 2021 06:08:03 +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 10G6838Q036866; Sat, 16 Jan 2021 06:08:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10G683mL036865; Sat, 16 Jan 2021 06:08:03 GMT (envelope-from git) Date: Sat, 16 Jan 2021 06:08:03 GMT Message-Id: <202101160608.10G683mL036865@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 6dd869c22bc4 - main - bectl: remove spurious aok variable MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6dd869c22bc4960b305a806867df7cfbc114f3a7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jan 2021 06:08:03 -0000 The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6dd869c22bc4960b305a806867df7cfbc114f3a7 commit 6dd869c22bc4960b305a806867df7cfbc114f3a7 Author: Kyle Evans AuthorDate: 2021-01-16 06:02:43 +0000 Commit: Kyle Evans CommitDate: 2021-01-16 06:07:50 +0000 bectl: remove spurious aok variable This rode in with the OpenZFS import. It may have been necessary at some point, but it is no longer and it breaks the WITHOUT_DYNAMICROOT build as it collides with the definition in libspl. Reported-by: Michael Dexter --- sbin/bectl/bectl.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index d4573393130d..50229b4b96b7 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -60,8 +60,6 @@ static int bectl_cmd_unmount(int argc, char *argv[]); libbe_handle_t *be; -int aok; - int usage(bool explicit) {