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.
This commit is contained in:
Íñigo Huguet 2023-07-21 13:29:29 +02:00
parent 97595fb00b
commit 3100e4b6e2
9 changed files with 12 additions and 11 deletions

View file

@ -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".

View file

@ -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

View file

@ -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".