diff --git a/contrib/scripts/nm-in-container.sh b/contrib/scripts/nm-in-container.sh index efa06fd6d6..68c2a6d3d1 100755 --- a/contrib/scripts/nm-in-container.sh +++ b/contrib/scripts/nm-in-container.sh @@ -25,6 +25,13 @@ set -e # It bind mounts the current working directory inside the container. # You can run `make install` and run tests. # There is a script nm-env-prepare.sh to generate a net1 interface for testing. +# +# This will bind-mount the NetworkManager working tree inside the container. +# Create a symlink ./.git/NetworkManager-ci, to also bind-mount the CI directory. +# +# Currently NM-ci requires a working eth1. +# Hence call `nm-env-prepare.sh --prefix eth -i 1 && nmcli device connect eth1` before +# running a CI test. ############################################################################### BASE_IMAGE="${BASE_IMAGE:-fedora:latest}" @@ -178,9 +185,12 @@ For example, configure NetworkManager with Test with: \$ systemctl stop NetworkManager; /opt/test/sbin/NetworkManager --debug 2>&1 | tee -a /tmp/nm-log.txt -Alternatively, configure with \`contrib/fedora/rpm/configure-for-system.sh\`, +Or better, configure with \`contrib/fedora/rpm/configure-for-system.sh\`, subsequent \`make && make install\` will overwrite your system's NetworkManager, and you can test it with \`systemctl daemon-reload ; systemctl restart NetworkManager\`. + +Run NM-ci tests after creating eth1 with +\`nm-env-prepare.sh --prefix eth -i 1 && nmcli device connect eth1\`. EOF cat <