diff --git a/ChangeLog.md b/ChangeLog.md index af16611f..0e0ab06a 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -54,7 +54,7 @@ * added -N option to "read" command * added "--inject" option to inject remaining arguments as already seen messages * use scans initiated by other participants and allow "--readonly" with "--scanconfig[=none]" -* let init script set the low_latency mode on serial device +* set the serial device to low latency mode to fix huge latency found on recent kernel versions # 2.4 (2016-12-17) diff --git a/contrib/debian/init.d/ebusd b/contrib/debian/init.d/ebusd old mode 100755 new mode 100644 index 0bb1680d..356fd1f0 --- a/contrib/debian/init.d/ebusd +++ b/contrib/debian/init.d/ebusd @@ -29,19 +29,10 @@ instance="EBUSD_OPTS$2" instance=${!instance} start_instance () { - local opts suffix dev + local opts suffix opts=$1 shift suffix="${opts#EBUSD_OPTS}" - dev=`echo " ${!opts}"|sed -e 's#^.* -d ##' -e 's# -.*$##'` - if [ -z "$dev" ]; then - dev=/dev/ttyUSB0 - fi - if [ "${dev:0:5}" == '/dev/' ] && [ -c "$dev" ] && [ -x /bin/setserial ]; then - log_daemon_msg "Setting low latency for ebusd${suffix} device" - /bin/setserial "$dev" low_latency - log_end_msg $? - fi log_daemon_msg "Starting ebusd${suffix}" ebusd pidfile=$PIDFILE_PREFIX${suffix}$PIDFILE_SUFFIX start-stop-daemon --start --quiet --oknodo --pidfile $pidfile --exec $DAEMON -- --pidfile $pidfile ${!opts} diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index 6f511fc1..f8ae83fd 100644 --- a/contrib/docker/Dockerfile +++ b/contrib/docker/Dockerfile @@ -2,8 +2,7 @@ FROM debian RUN apt-get update && apt-get install -y \ libmosquitto1 \ - curl \ - setserial + curl RUN apt-get update && apt-get install -y \ autoconf automake g++ make \ diff --git a/contrib/docker/release/Dockerfile b/contrib/docker/release/Dockerfile index b5609a10..dc0ed102 100644 --- a/contrib/docker/release/Dockerfile +++ b/contrib/docker/release/Dockerfile @@ -2,8 +2,7 @@ FROM debian RUN apt-get update && apt-get install -y \ libmosquitto1 \ - curl \ - setserial + curl LABEL maintainer "ebusd@ebusd.eu" diff --git a/contrib/docker/runtime/Dockerfile b/contrib/docker/runtime/Dockerfile index b3d21420..3850099d 100644 --- a/contrib/docker/runtime/Dockerfile +++ b/contrib/docker/runtime/Dockerfile @@ -2,8 +2,7 @@ FROM debian RUN apt-get update && apt-get install -y \ libmosquitto1 \ - curl \ - setserial + curl LABEL maintainer "ebusd@ebusd.eu" diff --git a/make_debian.sh b/make_debian.sh old mode 100755 new mode 100644 index 3eddd10f..3bed6750 --- a/make_debian.sh +++ b/make_debian.sh @@ -70,7 +70,7 @@ Architecture: $ARCH Maintainer: John Baier Homepage: https://github.com/john30/ebusd Bugs: https://github.com/john30/ebusd/issues -Depends: setserial, libstdc++6 (>= 4.8.1), libc6, libgcc1$extralibs +Depends: libstdc++6 (>= 4.8.1), libc6, libgcc1$extralibs Description: eBUS daemon. ebusd is a daemon for handling communication with eBUS devices connected to a 2-wire bus system.