From nobody Tue Jul 1 19:17:56 2025 X-Original-To: dev-commits-src-all@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 4bWt8h3bBWz60nM5; Tue, 01 Jul 2025 19:17:56 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bWt8h2ksKz3Y6g; Tue, 01 Jul 2025 19:17:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751397476; 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=f+bYM1KLRy6M0IKU+9SJ7BOoVVO/jbvOXiJX96ZE6Xw=; b=bKWCRFzlgkhP5kzYu7DeihnlIHt6yxJAgjkRya2/3KsmdyIJIoZHRyc3heF6QRGRekrrc2 mmM096iaadOnh4rZddTKLY23Q2jlXutIydJcUJeMRO6zcadUANygBxWsNVAiH9qgwIUGIp QxHCKhyip/Lb+BK85T4HvFCjW9m8ufHibXy+1zwwCHQtFi6emoGbmCUNqD23GMUb06JH/h w9eOrrl5GrsPtnS0O71+ATRQaG4qvdlmGSFdwOTDWARmyN2Eihgz6d2FQEGK6UHZY8xlax Vom9VmL+gSM3EbBhpZkA6yso6gxmTqPHMgOxlHb1aeNHZ/nfTft5yeIrkymtow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751397476; 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=f+bYM1KLRy6M0IKU+9SJ7BOoVVO/jbvOXiJX96ZE6Xw=; b=Ajt2GWaVuOLLJFuncpL1Yz7LfsieNEiBnUeTiAzJfMOrbNSipR7JFkzJU0EIlXgz/AGUVT D5MXw2tj2AlR3d9g6edeZPqBXP4OmPwBDl9Wv66C5Vfc89IXm86OIQ/VcZBTx0VEBYzt2w +Xi7V74sMLluuxvRBwgqZPUUnzEgOL84f3vxPHBdPyDtWQxl+7kqMY9Bp1LfLDTNivt1h5 yKBVAGHSrnyDi+5b3kxGTm9FcLpTiuRY0K8zcAt5gVStXxADHyl6FJZkRjTRqebN7rPAUs 7qMR44ANvcY/+h9ys6UQ/2eAVj7HnnGXjilde5bIFbMngOOQZo3qAelQRvEj6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751397476; a=rsa-sha256; cv=none; b=m+L/buLMsw6iVbQYSZh2wbEx0F30UugfT2HXM4r0PG8vkwL8/sBsdBk5UCgKhpEqak2u+a yftrfkxxqdh10PGKOUrSAzhCcQ99LgTZcW7c2pl5wcTNysNJCvZAo22zUYOwA+SHpt4eCu 4LC5mhLanTw7ySQ3Xc7JfKHTecekMm3TVEoMKgU3lbHOk5bb0FE7GeVSYvxwntn80L0Zu4 2d2s03zW1ait6clP0/5MTxA9JWbDavVRJPo2pguwMH8fpn3/pSS0bOFRoDaChxxvz2vxnC Cxv6g7oGZEUpDhQFLCVg1CA2ZpXDx2ZuyhMe4o52cTiDoHQ6naWVBLn7QHX2kw== 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 4bWt8h23dLznQw; Tue, 01 Jul 2025 19:17:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 561JHufa040979; Tue, 1 Jul 2025 19:17:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 561JHud5040976; Tue, 1 Jul 2025 19:17:56 GMT (envelope-from git) Date: Tue, 1 Jul 2025 19:17:56 GMT Message-Id: <202507011917.561JHud5040976@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Renato Botelho Subject: git: e690b6519ae7 - main - bectl: Print activate message in a single line List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: garga X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e690b6519ae70921b084d5df0e707abaf848d795 Auto-Submitted: auto-generated The branch main has been updated by garga: URL: https://cgit.FreeBSD.org/src/commit/?id=e690b6519ae70921b084d5df0e707abaf848d795 commit e690b6519ae70921b084d5df0e707abaf848d795 Author: Renato Botelho AuthorDate: 2025-07-01 19:14:16 +0000 Commit: Renato Botelho CommitDate: 2025-07-01 19:16:28 +0000 bectl: Print activate message in a single line When -t parameter is used, bectl prints a complementary message "for next boot" on a second line. Change it to print entire message on a single line. Reviewed by: kevans MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D49439 --- sbin/bectl/bectl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index 2ed365f93ad3..95715b34336b 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -158,13 +158,15 @@ bectl_cmd_activate(int argc, char *argv[]) /* activate logic goes here */ if ((err = be_activate(be, argv[0], temp)) != 0) /* XXX TODO: more specific error msg based on err */ - printf("Did not successfully activate boot environment %s\n", + printf("Did not successfully activate boot environment %s", argv[0]); else - printf("Successfully activated boot environment %s\n", argv[0]); + printf("Successfully activated boot environment %s", argv[0]); if (temp) - printf("for next boot\n"); + printf(" for next boot"); + + printf("\n"); return (err); }