From 3100e4b6e2e4ab06e1c91d8e165b8aec822a7dcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=8D=C3=B1igo=20Huguet?= <ihuguet@redhat.com>
Date: Fri, 21 Jul 2023 13:29:29 +0200
Subject: [PATCH] tools: nm-in-container: move data to a common path for
 nm-in-vm

nm-in-vm can use the same generated files than nm-in-container, so let's
move them to a place common for both: tools/nm-guest-data.

With this change, it is not worth it to have the nm-in-container
directory, so move the script to tools and delete the subdirectory.
---
 .../{nm-in-container/data => nm-guest-data}/.gitignore |  0
 tools/nm-guest-data/README.md                          | 10 ++++++++++
 .../data-_nm-in-container-setup.sh                     |  0
 .../data => nm-guest-data}/data-etc-rc.local           |  0
 .../data-etc-systemd-20-nm-in-container.override       |  0
 .../data => nm-guest-data}/data-nm-deploy.sh           |  0
 .../data => nm-guest-data}/data-nm-env-prepare.sh      |  0
 tools/{nm-in-container => }/nm-in-container            |  4 ++--
 tools/nm-in-container/README.md                        |  9 ---------
 9 files changed, 12 insertions(+), 11 deletions(-)
 rename tools/{nm-in-container/data => nm-guest-data}/.gitignore (100%)
 create mode 100644 tools/nm-guest-data/README.md
 rename tools/{nm-in-container/data => nm-guest-data}/data-_nm-in-container-setup.sh (100%)
 rename tools/{nm-in-container/data => nm-guest-data}/data-etc-rc.local (100%)
 rename tools/{nm-in-container/data => nm-guest-data}/data-etc-systemd-20-nm-in-container.override (100%)
 rename tools/{nm-in-container/data => nm-guest-data}/data-nm-deploy.sh (100%)
 rename tools/{nm-in-container/data => nm-guest-data}/data-nm-env-prepare.sh (100%)
 rename tools/{nm-in-container => }/nm-in-container (99%)
 delete mode 100644 tools/nm-in-container/README.md

diff --git a/tools/nm-in-container/data/.gitignore b/tools/nm-guest-data/.gitignore
similarity index 100%
rename from tools/nm-in-container/data/.gitignore
rename to tools/nm-guest-data/.gitignore
diff --git a/tools/nm-guest-data/README.md b/tools/nm-guest-data/README.md
new file mode 100644
index 0000000000..2b6aac3a53
--- /dev/null
+++ b/tools/nm-guest-data/README.md
@@ -0,0 +1,10 @@
+Run NetworkManager in Container for Development
+===============================================
+
+Run `nm-in-container` script for running NetworkManager in a non-root,
+privileged  podman container. Run `nm-in-vm` to do it in a vitual machine.
+This is useful for testing NetworkManager for development.
+
+Try `./nm-in-container --help` or `./nm-in-vm --help` to see options.  Inside
+the container, see the bash history for useful commands and read the hints in
+"/etc/motd".
diff --git a/tools/nm-in-container/data/data-_nm-in-container-setup.sh b/tools/nm-guest-data/data-_nm-in-container-setup.sh
similarity index 100%
rename from tools/nm-in-container/data/data-_nm-in-container-setup.sh
rename to tools/nm-guest-data/data-_nm-in-container-setup.sh
diff --git a/tools/nm-in-container/data/data-etc-rc.local b/tools/nm-guest-data/data-etc-rc.local
similarity index 100%
rename from tools/nm-in-container/data/data-etc-rc.local
rename to tools/nm-guest-data/data-etc-rc.local
diff --git a/tools/nm-in-container/data/data-etc-systemd-20-nm-in-container.override b/tools/nm-guest-data/data-etc-systemd-20-nm-in-container.override
similarity index 100%
rename from tools/nm-in-container/data/data-etc-systemd-20-nm-in-container.override
rename to tools/nm-guest-data/data-etc-systemd-20-nm-in-container.override
diff --git a/tools/nm-in-container/data/data-nm-deploy.sh b/tools/nm-guest-data/data-nm-deploy.sh
similarity index 100%
rename from tools/nm-in-container/data/data-nm-deploy.sh
rename to tools/nm-guest-data/data-nm-deploy.sh
diff --git a/tools/nm-in-container/data/data-nm-env-prepare.sh b/tools/nm-guest-data/data-nm-env-prepare.sh
similarity index 100%
rename from tools/nm-in-container/data/data-nm-env-prepare.sh
rename to tools/nm-guest-data/data-nm-env-prepare.sh
diff --git a/tools/nm-in-container/nm-in-container b/tools/nm-in-container
similarity index 99%
rename from tools/nm-in-container/nm-in-container
rename to tools/nm-in-container
index 83d8f7bde3..39f7ab1b54 100755
--- a/tools/nm-in-container/nm-in-container
+++ b/tools/nm-in-container
@@ -43,8 +43,8 @@ if [ -z "$BASE_IMAGE" ]; then
     BASE_IMAGE=fedora:latest
 fi
 
-BASEDIR_NM="$(readlink -f "$(dirname "$(readlink -f "$0")")/../..")"
-BASEDIR_DATA="$BASEDIR_NM/tools/nm-in-container/data"
+BASEDIR_NM="$(readlink -f "$(dirname "$(readlink -f "$0")")/..")"
+BASEDIR_DATA="$BASEDIR_NM/tools/nm-guest-data"
 
 BASEDIR_NM_CI=
 if [ -d "$BASEDIR_NM/.git/NetworkManager-ci" ] ; then
diff --git a/tools/nm-in-container/README.md b/tools/nm-in-container/README.md
deleted file mode 100644
index 64f699eb46..0000000000
--- a/tools/nm-in-container/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Run NetworkManager in Container for Development
-===============================================
-
-Run `nm-in-container` script for running NetworkManager in a non-root,
-privileged  podman container.  This is useful for testing NetworkManager for
-development.
-
-Try `./nm-in-container --help` to see options.  Inside the container, see the
-bash history for useful commands and read the hints in "/etc/motd".