From 4bd2731463230669c7c19c0ee085f3019f3ef169 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Wed, 7 Mar 2018 10:29:25 +0100 Subject: Ensure that tty can be read by cu On some OS, the rights/user from host are not duplicated on guest. So the tty is owned by root and cu could not read it. Force the owning of all tty by uucp --- lava-slave/scripts/start.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lava-slave/scripts/start.sh') diff --git a/lava-slave/scripts/start.sh b/lava-slave/scripts/start.sh index dcbbcd7..ec94aee 100755 --- a/lava-slave/scripts/start.sh +++ b/lava-slave/scripts/start.sh @@ -16,6 +16,8 @@ sleep 2 for item in $(ls /etc/conmux/*cf) do echo "Add $item" + # On some OS, the rights/user from host are not duplicated on guest + grep -o '/dev/[a-zA-Z0-9_-]*' $item | xargs chown uucp /usr/sbin/conmux $item & done -- cgit 1.2.3-korg From 277552fb20a1b9919d9600390f96ecd1c71d44e8 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Wed, 7 Mar 2018 10:44:52 +0100 Subject: Reorder start of slave services Starting lava-slave too early is dangerous since some services it needs are not started yet. Always start lava-slave in last. --- lava-slave/scripts/start.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'lava-slave/scripts/start.sh') diff --git a/lava-slave/scripts/start.sh b/lava-slave/scripts/start.sh index ec94aee..92e76bb 100755 --- a/lava-slave/scripts/start.sh +++ b/lava-slave/scripts/start.sh @@ -6,10 +6,6 @@ fi service tftpd-hpa start || exit 4 -# FIXME lava-slave does not run if old pid is present -rm -f /var/run/lava-slave.pid -service lava-slave start || exit 5 - touch /var/run/conmux-registry /usr/sbin/conmux-registry 63000 /var/run/conmux-registry& sleep 2 @@ -22,4 +18,10 @@ do done # start an http file server for boot/transfer_overlay support -(cd /var/lib/lava/dispatcher; python -m SimpleHTTPServer 80) +(cd /var/lib/lava/dispatcher; python -m SimpleHTTPServer 80) & + +# FIXME lava-slave does not run if old pid is present +rm -f /var/run/lava-slave.pid +service lava-slave start || exit 5 + +sleep 3650d -- cgit 1.2.3-korg