From 7b389f6d0ac68583f96f337dd4662ff8df42a20b Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sat, 16 Nov 2024 14:24:36 +0100 Subject: [PATCH] confd: quiet container script log messages Should be inverted to a --verbose or --debug flag instead. After this change we still see the full 'podman create ...' command, with all the optionas and arguments. Signed-off-by: Joachim Wiberg --- board/common/rootfs/usr/sbin/container | 2 +- src/confd/src/infix-containers.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/common/rootfs/usr/sbin/container b/board/common/rootfs/usr/sbin/container index 4b622315..d1e5b4c5 100755 --- a/board/common/rootfs/usr/sbin/container +++ b/board/common/rootfs/usr/sbin/container @@ -213,7 +213,7 @@ create() fi # shellcheck disable=SC2048 - log "Calling podman create --name $name --conmon-pidfile=$pidfn $args $image $*" + log "podman create --name $name --conmon-pidfile=$pidfn $args $image $*" if podman create --name "$name" --conmon-pidfile="$pidfn" $args "$image" $*; then [ -n "$quiet" ] || log "Successfully created container $name from $image" [ -n "$manual" ] || start "$name" diff --git a/src/confd/src/infix-containers.c b/src/confd/src/infix-containers.c index 1e39905f..fc78a073 100644 --- a/src/confd/src/infix-containers.c +++ b/src/confd/src/infix-containers.c @@ -42,9 +42,9 @@ static int add(const char *name, struct lyd_node *cif) /* Stop any running container gracefully so it releases its IP addresses. */ fprintf(fp, "#!/bin/sh\n" - "container stop %s >/dev/null\n" /* Silence "not running" on upgrade */ - "container delete %s >/dev/null\n" /* Silence any hashes when deleting */ - "container", name, name); + "container --quiet stop %s >/dev/null\n" /* Silence "not running" on upgrade */ + "container --quiet delete %s >/dev/null\n" /* Silence any hashes when deleting */ + "container --quiet", name, name); LYX_LIST_FOR_EACH(lyd_child(cif), node, "dns") fprintf(fp, " --dns %s", lyd_get_value(node));