summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-networking/recipes-protocols/openl2tp/openl2tp/run-ptest7
-rw-r--r--meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb1
2 files changed, 4 insertions, 4 deletions
diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/run-ptest b/meta-networking/recipes-protocols/openl2tp/openl2tp/run-ptest
index 01c9c7b447..b8fb08b758 100644
--- a/meta-networking/recipes-protocols/openl2tp/openl2tp/run-ptest
+++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/run-ptest
@@ -30,9 +30,7 @@ else
30fi 30fi
31 31
32#read -p "Please input the network interface you use to test(such as eth0, em1 etc):" ETH_TEST 32#read -p "Please input the network interface you use to test(such as eth0, em1 etc):" ETH_TEST
33echo "Please input the network interface you use to test(such as eth0, em1 etc):" 33ETH_TEST=`ip route get 8.8.8.8 | awk -- '{print $5}'`
34read ETH_TEST > /dev/null
35
36if [ x"$ETH_TEST" = x ]; then 34if [ x"$ETH_TEST" = x ]; then
37 exit_cus "The network interface cannot be null" 1 35 exit_cus "The network interface cannot be null" 1
38fi 36fi
@@ -73,7 +71,7 @@ lsmod | grep l2tp_ppp > /dev/null || exit_cus "FAIL: Load module l2tp_ppp" 2
73 71
74# start openl2tpd 72# start openl2tpd
75ps aux | grep openl2tpd | grep -v grep > /dev/null && killall openl2tpd > /dev/null 73ps aux | grep openl2tpd | grep -v grep > /dev/null && killall openl2tpd > /dev/null
76ppp_path=`rpm -ql openl2tp | grep ppp_null.so` 74ppp_path=`find / -name ppp_null.so`
77echo "test it here" 75echo "test it here"
78/usr/sbin/openl2tpd -d all -D -f -p ${ppp_path} & > /dev/null 76/usr/sbin/openl2tpd -d all -D -f -p ${ppp_path} & > /dev/null
79 77
@@ -95,3 +93,4 @@ else
95fi 93fi
96 94
97restore_file 95restore_file
96ps aux | grep openl2tpd | grep -v grep > /dev/null && killall openl2tpd > /dev/null
diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb
index f64c7340d1..f3b74d1e61 100644
--- a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb
+++ b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb
@@ -94,3 +94,4 @@ do_install_ptest () {
94} 94}
95 95
96RDEPENDS:${PN} = "ppp ppp-l2tp bash" 96RDEPENDS:${PN} = "ppp ppp-l2tp bash"
97RDEPENDS:${PN}-ptest += "rpcbind kernel-module-l2tp-ppp procps-ps tcl"