From nobody Sat Jul 26 03:14:06 2025 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 4bpqb25z17z62yB7; Sat, 26 Jul 2025 03:14:06 +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 4bpqb23Z7zz3cBd; Sat, 26 Jul 2025 03:14:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753499646; 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=3Dok1xo4iwILFvIj03H3RKivfY6A6/FZN5VtS+Gn0VU=; b=aTWmLEg2PLfkHVh2pxmEvSPjAdOJsvY0nx2MH1wZhVaVQ5IIhFE95kvJEuUfIwT5XO237v 482PC+bzn1fbx3JaBkMwMqQmkso4H1IPdAJK2axtjReZZj+RgsSro8kjAv/ckrmck4OIxQ lUrjrJ8Jt/am/Wr/Qm267JWMv6Ke8YdnraROHfEZm7xRNo+EvB5R4pnBrztiOGHGuR4B5Z kqD2mOwPRnBXNi0gICK+Jh6TAiNFafoH+weExcEU81lRPbFBSv1xx3d/Vx4coO75cLYp1u 05ifu8PTaD4xNPeGCY6w0NtTLqv24m1fksvQhwTLDZUEJkASlv+gdvCzTSY9DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753499646; 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=3Dok1xo4iwILFvIj03H3RKivfY6A6/FZN5VtS+Gn0VU=; b=R5WOG01oImXUzGEjAQsULPM5rMra3SeY0XSYckqytA1FxvV0O5p01XTii9uiglOQ23/9rx OPEf53NgG+I4t+ucMmNTy4oTQr4LA23v4S/saxogXW3Qotr7piw4adE9bfgKS7vIJAVXBG EdbMfMn+HD5RNkDF06AniJ93K+jT4wYEJdSWrBO3Uj3PVju3JeY5yXOxepTW4efk3TpKke Ira8ZTWZtaKyWXUlkHzkor9NLbs524m56Zy/CObEQNnZ7JEcJiLJjw0992R9pwMhXVY0B7 Zww1FMXOoleYH2Kbx55dzuUJzw8Gf711WCrXgv/2qPigmQYFbxkNTA9As8V0RQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753499646; a=rsa-sha256; cv=none; b=rkEPz/LUTNBhzD4jwgKwv5SfZTmy5cAAvFKdwpG74xRkf+5WjqvMLaiiF4T+ouTuGVeweV PK99CVVwEZxuFB/r40xIpyj094/BeKJSSZ3+C3Q/MuRiqqJaLovwWPlWzbo7dwn43zUO04 r2aJMqaUZ1l0BU4vWJxT5v6pwI2Qz7aZeZVH12dmpY2jwMPTWwZ6fzo8YGZG/siyicNKQy YFE+dNufuXJeO37dN171yqLo+2+BQ41QeokqFNBCmXaYxEVXxk6PjBl1AmBo38lqFEiXWm urTEC07NBBVZFJki1ow/IkulviCq2sBDmbcL6izYYwBloXvOVTuvE32TdeHmfQ== 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 4bpqb22bJmz1BQ8; Sat, 26 Jul 2025 03:14:06 +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 56Q3E6o9002905; Sat, 26 Jul 2025 03:14:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56Q3E68k002902; Sat, 26 Jul 2025 03:14:06 GMT (envelope-from git) Date: Sat, 26 Jul 2025 03:14:06 GMT Message-Id: <202507260314.56Q3E68k002902@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: 1d8590371049 - main - jls: add a -c mode to check for a jail's existence 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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: 1d8590371049bb14a6410fa83cd03d9eca32f764 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=1d8590371049bb14a6410fa83cd03d9eca32f764 commit 1d8590371049bb14a6410fa83cd03d9eca32f764 Author: Kyle Evans AuthorDate: 2025-07-26 03:13:43 +0000 Commit: Kyle Evans CommitDate: 2025-07-26 03:13:43 +0000 jls: add a -c mode to check for a jail's existence This is intended to be primarily used in scripts that want to check if a jail exists before taking some action -- for instance, the jail(8) test cleanup functions that want to remove the jail if it still exists. Having a mode that limits its output for their usage is useful both for cleaner scripts and also to avoid masking real problems. Reviewed by: jamie Differential Revision: https://reviews.freebsd.org/D51541 --- usr.sbin/jls/jls.8 | 20 ++++++++++++++++++-- usr.sbin/jls/jls.c | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 62 insertions(+), 6 deletions(-) diff --git a/usr.sbin/jls/jls.8 b/usr.sbin/jls/jls.8 index f7a5eeb321ef..715033082963 100644 --- a/usr.sbin/jls/jls.8 +++ b/usr.sbin/jls/jls.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 13, 2025 +.Dd July 25, 2025 .Dt JLS 8 .Os .Sh NAME @@ -35,6 +35,10 @@ .Op Fl dhNnqsv .Op Fl j Ar jail .Op Ar parameter ... +.Nm +.Fl c +.Op Fl d +.Fl j Ar jail .Sh DESCRIPTION The .Nm @@ -54,11 +58,21 @@ for a description of some core parameters. If no .Ar parameters or any of the options -.Fl hns +.Fl chns are given, the following four columns will be printed: jail identifier (jid), IP address (ip4.addr), hostname (host.hostname), and path (path). .Pp +When the +.Fl c +option is used, +.Nm +will not emit any output except for usage errors. +This mode is intended solely to check for a single jail's existence, and it does +not accept any +.Ar parameter +or print-option flags. +.Pp The following options are available: .Bl -tag -width indent .It Fl -libxo @@ -68,6 +82,8 @@ in a selection of different human and machine readable formats. See .Xr xo_options 7 for details on command line arguments. +.It Fl c +Only check for the jail's existence. .It Fl d List .Va dying diff --git a/usr.sbin/jls/jls.c b/usr.sbin/jls/jls.c index a1d1716713aa..4f697a5bb382 100644 --- a/usr.sbin/jls/jls.c +++ b/usr.sbin/jls/jls.c @@ -37,6 +37,7 @@ #include #include +#include #include #include #include @@ -59,6 +60,7 @@ #define PRINT_SKIP 0x10 #define PRINT_VERBOSE 0x20 #define PRINT_JAIL_NAME 0x40 +#define PRINT_EXISTS 0x80 static struct jailparam *params; static int *param_parent; @@ -81,6 +83,14 @@ static void quoted_print(int pflags, char *name, char *value); static void emit_ip_addr_list(int af_family, const char *list_name, struct jailparam *param); +static void +usage(void) +{ + xo_errx(1, + "usage: jls [-dhNnqv] [-j jail] [param ...]\n" + " jls -c [-d] -j jail"); +} + int main(int argc, char **argv) { @@ -94,12 +104,15 @@ main(int argc, char **argv) xo_set_version(JLS_XO_VERSION); jname = NULL; pflags = jflags = jid = 0; - while ((c = getopt(argc, argv, "adj:hNnqsv")) >= 0) + while ((c = getopt(argc, argv, "acdj:hNnqsv")) >= 0) switch (c) { case 'a': case 'd': jflags |= JAIL_DYING; break; + case 'c': + pflags |= PRINT_EXISTS; + break; case 'j': jid = strtoul(optarg, &ep, 10); if (!jid || *ep) { @@ -130,7 +143,7 @@ main(int argc, char **argv) PRINT_VERBOSE; break; default: - xo_errx(1, "usage: jls [-dhNnqv] [-j jail] [param ...]"); + usage(); } #ifdef INET6 @@ -144,7 +157,24 @@ main(int argc, char **argv) argv += optind; /* Add the parameters to print. */ - if (argc == 0) { + if ((pflags & PRINT_EXISTS) != 0) { + if ((pflags & ~PRINT_EXISTS) != 0) { + xo_warnx("-c is incompatible with other print options"); + usage(); + } else if (argc != 0) { + xo_warnx("-c does not accept non-option arguments"); + usage(); + } else if (jid == 0 && jname == NULL) { + xo_warnx("-j jail to check must be provided for -c"); + usage(); + } + + /* + * Force libxo to be silent, as well -- we're only wanting our + * exit status. + */ + xo_set_style(NULL, XO_STYLE_TEXT); + } else if (argc == 0) { if (pflags & (PRINT_HEADER | PRINT_NAMEVAL)) add_param("all", NULL, (size_t)0, NULL, JP_USER); else if (pflags & PRINT_VERBOSE) { @@ -239,9 +269,17 @@ main(int argc, char **argv) xo_open_list("jail"); /* Fetch the jail(s) and print the parameters. */ if (jid != 0 || jname != NULL) { - if (print_jail(pflags, jflags) < 0) + if (print_jail(pflags, jflags) < 0) { + /* + * We omit errors from existential issues if we're just + * doing a -c check that the jail exists. + */ + if (pflags & PRINT_EXISTS) + exit(1); xo_errx(1, "%s", jail_errmsg); + } } else { + assert((pflags & PRINT_EXISTS) == 0); for (lastjid = 0; (lastjid = print_jail(pflags, jflags)) >= 0; ) ; @@ -392,6 +430,8 @@ print_jail(int pflags, int jflags) jid = jailparam_get(params, nparams, jflags); if (jid < 0) return jid; + else if (pflags & PRINT_EXISTS) + return 0; xo_open_instance("jail");