summaryrefslogtreecommitdiffstats
path: root/lava-slave
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2018-06-06 11:15:35 +0200
committerCorentin LABBE <clabbe@baylibre.com>2018-07-04 14:09:24 +0200
commit615e0d597510736dab68e41bd9dc002da6b2514f (patch)
tree5635957b16b4cbec74132b4f26affc5dba4c62ec /lava-slave
parentc1071d0f9b57958b22546abe8eadf670b3926b98 (diff)
Implement ser2net
This patch add support for ser2net. ser2net can be used by adding "use_ser2net: True" to uart.
Diffstat (limited to 'lava-slave')
-rw-r--r--lava-slave/Dockerfile3
-rwxr-xr-xlava-slave/scripts/start.sh3
-rw-r--r--lava-slave/ser2net.conf0
3 files changed, 6 insertions, 0 deletions
diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile
index b7252ef..11ef6c8 100644
--- a/lava-slave/Dockerfile
+++ b/lava-slave/Dockerfile
@@ -53,6 +53,9 @@ RUN apt-get update
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install cu
RUN rm /etc/apt/sources.list.d/testing.list
+RUN apt-get -y install ser2net
+COPY ser2net.conf /etc
+
COPY scripts/lava-slave /etc/init.d/
RUN chmod 755 /etc/init.d/lava-slave
diff --git a/lava-slave/scripts/start.sh b/lava-slave/scripts/start.sh
index 35e58a4..ef6eb68 100755
--- a/lava-slave/scripts/start.sh
+++ b/lava-slave/scripts/start.sh
@@ -8,6 +8,9 @@ if [[ -n "$LAVA_MASTER" ]]; then
fi
service tftpd-hpa start || exit 4
+if [ -s /etc/ser2net.conf ];then
+ service ser2net start || exit 7
+fi
touch /var/run/conmux-registry
/usr/sbin/conmux-registry 63000 /var/run/conmux-registry&
diff --git a/lava-slave/ser2net.conf b/lava-slave/ser2net.conf
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lava-slave/ser2net.conf