From bf6d5f355e4e31ab4c899b35b8afaa495562a456 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 20 Sep 2021 19:03:05 +0200 Subject: [PATCH] contrib: improve nm-in-container.sh script (6) --- contrib/scripts/nm-in-container.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/contrib/scripts/nm-in-container.sh b/contrib/scripts/nm-in-container.sh index bb14d82918..83a6124993 100755 --- a/contrib/scripts/nm-in-container.sh +++ b/contrib/scripts/nm-in-container.sh @@ -120,6 +120,12 @@ alias n="ninja -C build" alias l='ls -l --color=auto' +Clean() { + systemctl stop NetworkManager + rm -i -rf /run/NetworkManager + nm-env-prepare.sh +} + nm_run_gdb() { systemctl stop NetworkManager.service gdb --args "\${1:-/opt/test/sbin/NetworkManager}" --debug @@ -316,10 +322,18 @@ do_run() { podman start "$CONTAINER_NAME_NAME" else bind_files BIND_FILES + + BIND_NM_CI=() + if [ -d "$BASEDIR_NM/.git/NetworkManager-ci" ] ; then + DIR="$(readlink -f "$BASEDIR_NM/.git/NetworkManager-ci")" + BIND_NM_CI=(-v "$DIR:$DIR:Z") + fi + podman run --privileged \ --name "$CONTAINER_NAME_NAME" \ -d \ -v "$BASEDIR_NM:$BASEDIR_NM:Z" \ + "${BIND_NM_CI[@]}" \ "${BIND_FILES[@]}" \ "$CONTAINER_NAME_REPOSITORY:$CONTAINER_NAME_TAG" fi