Skip to contentSkip to conversation

guestfs: Ensure we use the right URI when using the guest agent

PATCH In review Scott Mayhew 2 participants 2 messages Jan 2, 2024 – Jan 3, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 guestfs: Ensure we use the right URI when using the guest agent

Ensure we use the right URI when using the guest agent to get the IP address of the guest.

---
 scripts/guestfs.Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/guestfs.Makefile +1 -1
index 958063d5..211ac9ba 100644
@@ -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 \
Signature · 1 line
2.41.0
#1 lore raw
Quoted 13 lines · Scott Mayhew

Ensure we use the right URI when using the guest agent to get the IP address of the guest.

---
 scripts/guestfs.Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/guestfs.Makefile +0 -0
index 958063d5..211ac9ba 100644

scripts/guestfs.Makefile libvirt_pcie_passthrough_permissions: · line 74

Quoted 8 lines
scripts/guestfs.Makefile +1 -1
@@ -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 \

Merged. Many thanks!

Signature · 1 line
Jeff Layton <[email protected]>