From 958d2b3b7f7626b4b2124d5e4b9f29607541d759 Mon Sep 17 00:00:00 2001 From: Martin Necas Date: Fri, 13 Sep 2024 16:13:35 +0200 Subject: [PATCH] Fix netplan output Signed-off-by: Martin Necas --- Makefile | 2 +- virt-v2v/cold/scripts/rhel/run/network_config_util.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 42d58fa07..a26c00037 100644 --- a/Makefile +++ b/Makefile @@ -331,7 +331,7 @@ check_container_runtime: fi bazel-generate: - bazel run //:gazelle + bazel run //:gazelle cmd operator pkg tests validation .PHONY: controller-gen controller-gen: $(CONTROLLER_GEN) diff --git a/virt-v2v/cold/scripts/rhel/run/network_config_util.sh b/virt-v2v/cold/scripts/rhel/run/network_config_util.sh index 0f06f2b23..bca25c9e5 100644 --- a/virt-v2v/cold/scripts/rhel/run/network_config_util.sh +++ b/virt-v2v/cold/scripts/rhel/run/network_config_util.sh @@ -136,13 +136,13 @@ udev_from_netplan() { # Function to check if netplan supports the 'get' subcommand netplan_supports_get() { - netplan get 2>&3 + netplan get >&3 return $? } # netplan with root dir netplan_get() { - netplan get --root-dir "$NETPLAN_DIR" "$@" >&3 + netplan get --root-dir "$NETPLAN_DIR" "$@" 2>&3 } # Loop over all interface names and return the one with target_ip, or null