[2438] added path to pydnspp to PYTHONPATH for run_bindctl.

necessary for systest to pass on some environment

diff --git a/src/bin/bindctl/run_bindctl.sh.in b/src/bin/bindctl/run_bindctl.sh.in
index f4cc40c718ee8e7ddba27294016c50bdcf3fcb7e..999d7eef5eaf5b7dc78aaf81e4c32ca5dd0c140a 100755 (executable)
--- a/src/bin/bindctl/run_bindctl.sh.in
+++ b/src/bin/bindctl/run_bindctl.sh.in
@@ -20,7 +20,10 @@ export PYTHON_EXEC
 
 BINDCTL_PATH=@abs_top_builddir@/src/bin/bindctl
 
-PYTHONPATH=@abs_top_srcdir@/src/bin:@abs_top_builddir@/src/lib/python/isc/log_messages:@abs_top_builddir@/src/lib/python:@abs_top_builddir@/src/bin:@abs_top_srcdir@/src/lib/python
+# Note: lib/dns/python/.libs is necessary because __init__.py of isc package
+# automatically imports isc.datasrc, which then requires the DNS loadable
+# module.  #2145 should eliminate the need for it.
+PYTHONPATH=@abs_top_srcdir@/src/bin:@abs_top_builddir@/src/lib/python/isc/log_messages:@abs_top_builddir@/src/lib/python:@abs_top_builddir@/src/bin:@abs_top_srcdir@/src/lib/python:@abs_top_builddir@/src/lib/dns/python/.libs
 export PYTHONPATH
 
 # If necessary (rare cases), explicitly specify paths to dynamic libraries

diff --git a/tests/system/ifconfig.sh b/tests/system/ifconfig.sh
index c0c365ad38b124ac97c6e6086cefa97a82197eec..7c695e2af3d942a68808ab34584b015b1036f0b6 100755 (executable)
--- a/tests/system/ifconfig.sh
+++ b/tests/system/ifconfig.sh
@@ -63,7 +63,7 @@ esac
 case "$1" in
 
     start|up)
-       for ns in 1 2 3 4 5 6 7
+       for ns in 1 2 3 4 5 6 7 8
        do
                if test -n "$base"
                then
@@ -145,7 +145,7 @@ case "$1" in
        ;;
 
     stop|down)
-       for ns in 7 6 5 4 3 2 1
+       for ns in 8 7 6 5 4 3 2 1
        do
                if test -n "$base"
                then