From nobody Tue Jul 8 11:46:32 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 4bbzpd4p2Sz60tG0; Tue, 08 Jul 2025 11:46:33 +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 4bbzpd1chGz40cS; Tue, 08 Jul 2025 11:46:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751975193; 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=1dUBpNwUb0YzcyG9vD5a889V8UD+Syrx4YmMrXZxaM8=; b=v20y0yUxNspScDH1M9+eTXPU7g6McSYzewfI2DV2V2UbIJl0VAoLe7jjqVW1t08R4RVTSU M1GiGZWBLm+aBerWxIDupOdgR05LYVOW6esixBzF3gE8ilPXgO0SPAoWEt7zNYu0OldkBQ WT4JevTVTvYcs4hUL+Fala7uOqBRgIJThquS4Qc6k1t+wnsuEqnvbha73pR0VvsgsGv5ro me2Kb+InBfWCW52qnH9Tjx2+vMe0SoR57y2RVBDL7wCuu5OBOenzyekYE+toNFnkKChMMm ImGqg3SRa4IbMD+jLdoCU6c/KeP8fs6xhGilfX2pukFzTSROlJDBmgvQ+snA9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751975193; 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=1dUBpNwUb0YzcyG9vD5a889V8UD+Syrx4YmMrXZxaM8=; b=mP+O4XtL7cJHiTd8l2oNYIQr7mHD91zEi41XFwwu6i15zpZQutkPt4Gs/Mhdb45zm5IqL3 1x0Aye7uN6Rb1pjUPCY/uafZJaf51VhPBBQWyGJT9hZHHYa+nJkx3Aakwo6ypuIJOzqBUm +txnR5nr+DoZC06JMmv8DTnNvx8xM25L7yCTINpqDwwjkgNP+yUYJHDOEXibtetP+rLVSz Y5m5EplDAk3lMNBsMecUtFzG5JfIp4R2OirDd0gs7owlzOOWvz+fuNfzhNVr0uDjefw4UL rr+jsds0XRhyCvhmd0CAKbgYKorRHZ0xVMbJl6GzFZbEiaxmb00QH/Iwbjm31g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751975193; a=rsa-sha256; cv=none; b=yX6uyvRRmEA1lTflUIxvidashZkNSPPKbhvxLEAP1G7uOl/8T1aoCNVr1/YCa5ZZZExfuV Ry4ZVfsBqBiRe4DtEtLl6RIU3K7+CVJW4Mw+9ldar9eD1LvkIlzVYSCiBaPjkZmiff0gM2 x1Tw+HWoA5KnSXbcQPTCXgybASF1SsqA3sA5W1COoVRfv1LpHTxCmRgcvCBRrgbA5nRqZp IRyKH0NNZwm5q7FlXd+j4hUgAHJrOHzKE46hcrxpPHKHItGrWMfReSOJMGl41/pJWR1CSd fVy6tBYM6hH+pwiZ7c+shRC9qBglWbEtrJDCytledZdNVElVlVn7sHPD5uXrTQ== 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 4bbzpd0kRmzc2h; Tue, 08 Jul 2025 11:46:33 +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 568BkWmg055558; Tue, 8 Jul 2025 11:46:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568BkWW4055555; Tue, 8 Jul 2025 11:46:32 GMT (envelope-from git) Date: Tue, 8 Jul 2025 11:46:32 GMT Message-Id: <202507081146.568BkWW4055555@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Renato Botelho Subject: git: a9475bf3dfb2 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: a9475bf3dfb23782ce9e1d4da16473b2f9597d6b Auto-Submitted: auto-generated The branch stable/14 has been updated by garga: URL: https://cgit.FreeBSD.org/src/commit/?id=a9475bf3dfb23782ce9e1d4da16473b2f9597d6b commit a9475bf3dfb23782ce9e1d4da16473b2f9597d6b Author: Renato Botelho AuthorDate: 2025-07-01 19:14:16 +0000 Commit: Renato Botelho CommitDate: 2025-07-08 11:46:24 +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 (cherry picked from commit e690b6519ae70921b084d5df0e707abaf848d795) --- 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 be95ca5cd36a..f37a1473680e 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -159,13 +159,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); }