Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 546411799D for ; Tue, 2 Jan 2024 22:24:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="MRaHyyG8" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704234297; 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=24JOXjG1b/1CI3FNnTVzM2C9OzWNknC+sEXocwQW6LI=; b=MRaHyyG8pBNjwQU084MJoCtndV3rMC4MMUxkoXNk6bqjTtoAV3Q2x4lEfVBgFn3RMzZbCX WvEeEXTgeV0ZkI4b/IiMMeA/FP5D9Cthd0d7Eav/BqxE4OsYiajzm2mL0StzK/stBKcZlE pQ7L6qHPRxibZ8lQYvrgIYMaL9k4J64= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-88-fn3YL5InNlSxAVQErWnlLw-1; Tue, 02 Jan 2024 17:24:54 -0500 X-MC-Unique: fn3YL5InNlSxAVQErWnlLw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BD6913C29A62 for ; Tue, 2 Jan 2024 22:24:53 +0000 (UTC) Received: from aion.redhat.com (unknown [10.22.32.219]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AFC0D2166B31 for ; Tue, 2 Jan 2024 22:24:53 +0000 (UTC) Received: from aion.redhat.com (localhost [IPv6:::1]) by aion.redhat.com (Postfix) with ESMTP id 3AEC21142D0 for ; Tue, 2 Jan 2024 17:24:53 -0500 (EST) From: Scott Mayhew To: kdevops@lists.linux.dev Subject: [PATCH] guestfs: Ensure we use the right URI when using the guest agent Date: Tue, 2 Jan 2024 17:24:53 -0500 Message-ID: <20240102222453.34618-1-smayhew@redhat.com> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true Ensure we use the right URI when using the guest agent to get the IP address of the guest. Signed-off-by: Scott Mayhew --- scripts/guestfs.Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/guestfs.Makefile b/scripts/guestfs.Makefile index 958063d5..211ac9ba 100644 --- a/scripts/guestfs.Makefile +++ b/scripts/guestfs.Makefile @@ -68,7 +68,7 @@ libvirt_pcie_passthrough_permissions: $(KDEVOPS_GUESTFS_PROVISIONED): $(Q)if [[ "$(CONFIG_KDEVOPS_SSH_CONFIG_UPDATE)" == "y" ]]; then \ - $(TOPDIR)/scripts/update_ssh_config_guestfs.py; \ + LIBVIRT_DEFAULT_URI=$(CONFIG_LIBVIRT_URI) $(TOPDIR)/scripts/update_ssh_config_guestfs.py; \ fi $(Q)if [[ "$(CONFIG_KDEVOPS_ANSIBLE_PROVISION_PLAYBOOK)" != "" ]]; then \ ansible-playbook $(ANSIBLE_VERBOSE) -i \ -- 2.41.0