diff --git a/recipes-extended/socket-uart/files/socat-socket-kline b/recipes-extended/socket-uart/files/socat-socket-kline index 8f0130f..8b8a2e8 100644 --- a/recipes-extended/socket-uart/files/socat-socket-kline +++ b/recipes-extended/socket-uart/files/socat-socket-kline @@ -1,25 +1,19 @@ #!/bin/sh - -ping $SOCAT_SOCKET_KLINE_IP -w 3 -c 1 - -if [ $? -eq 0 ] -then +if [ -z $USER_MODULE_ipv4_addr ]; then + echo Start script by systemd service or set variables +else if [ -x "$(command -v socat)" ]; then - echo "start listening socket-uart services with server IP $SOCAT_SOCKET_KLINE_IP on port $SOCAT_SOCKET_KLINE_PORT" - cmd='socat -s pty,link=/dev/ttyUM1,raw,echo=0,b19200 tcp:$SOCAT_SOCKET_KLINE_IP:$SOCAT_SOCKET_KLINE_PORT' + echo "start listening socket-uart services with server IP $USER_MODULE_ipv4_addr on port $USER_MODULE_kline_port" + cmd='socat -s pty,link=/dev/ttyUM1,raw,echo=0,b19200 tcp:$USER_MODULE_ipv4_addr:$USER_MODULE_kline_port' if [[ -n $SOCAT_SOCKET_KLINE_MSS ]]; then eval $cmd,mss=$SOCAT_SOCKET_KLINE_MSS else eval $cmd fi - else echo "socat command not available on your target or environment" - # return 1 so that systemd knows the service failed to start - exit 1 fi - fi exit 1 diff --git a/recipes-extended/socket-uart/files/socat-socket-lin b/recipes-extended/socket-uart/files/socat-socket-lin index 7424b66..ba8fddc 100644 --- a/recipes-extended/socket-uart/files/socat-socket-lin +++ b/recipes-extended/socket-uart/files/socat-socket-lin @@ -1,25 +1,18 @@ #!/bin/sh - -ping $SOCAT_SOCKET_LIN_IP -w 3 -c 1 - -if [ $? -eq 0 ] -then - +if [ -z $USER_MODULE_ipv4_addr ]; then + echo Start script by systemd service or set variables +else if [ -x "$(command -v socat)" ]; then - echo "start listening socket-uart services with server IP $SOCAT_SOCKET_LIN_IP on port $SOCAT_SOCKET_LIN_PORT" - cmd='socat -s pty,link=/dev/ttyUM2,raw,echo=0 tcp:$SOCAT_SOCKET_LIN_IP:$SOCAT_SOCKET_LIN_PORT' + echo "start listening socket-uart services with server IP $USER_MODULE_ipv4_addr on port $USER_MODULE_lin_port" + cmd='socat -s pty,link=/dev/ttyUM2,raw,echo=0 tcp:$USER_MODULE_ipv4_addr:$USER_MODULE_lin_port' if [[ -n $SOCAT_SOCKET_LIN_MSS ]]; then eval $cmd,mss=$SOCAT_SOCKET_LIN_MSS else eval $cmd fi - else echo "socat command not available on your target or environment" - # return 1 so that systemd knows the service failed to start - exit 1 fi - fi exit 1 diff --git a/recipes-extended/socket-uart/files/socat-socket-uart b/recipes-extended/socket-uart/files/socat-socket-uart index d66ff8b..a6ed780 100644 --- a/recipes-extended/socket-uart/files/socat-socket-uart +++ b/recipes-extended/socket-uart/files/socat-socket-uart @@ -1,25 +1,19 @@ #!/bin/sh - -ping $SOCAT_SOCKET_UART_IP -w 3 -c 1 - -if [ $? -eq 0 ] -then +if [ -z $USER_MODULE_ipv4_addr ]; then + echo Start script by systemd service or set variables +else if [ -x "$(command -v socat)" ]; then - echo "start listening socket-uart services with server IP $SOCAT_SOCKET_UART_IP on port $SOCAT_SOCKET_UART_PORT" - cmd='socat -s pty,link=/dev/ttyUM0,raw,echo=0,b115200 tcp:$SOCAT_SOCKET_UART_IP:$SOCAT_SOCKET_UART_PORT' + echo "start listening socket-uart services with server IP $USER_MODULE_ipv4_addr on port $USER_MODULE_uart_port" + cmd='socat -s pty,link=/dev/ttyUM0,raw,echo=0,b115200 tcp:$USER_MODULE_ipv4_addr:$USER_MODULE_uart_port' if [[ -n $SOCAT_SOCKET_UART_MSS ]]; then eval $cmd,mss=$SOCAT_SOCKET_UART_MSS else eval $cmd fi - else echo "socat command not available on your target or environment" - # return 1 so that systemd knows the service failed to start - exit 1 fi - fi exit 1 diff --git a/recipes-extended/socket-uart/files/socket-kline.service b/recipes-extended/socket-uart/files/socket-kline.service index 33257a8..1f6a717 100644 --- a/recipes-extended/socket-uart/files/socket-kline.service +++ b/recipes-extended/socket-uart/files/socket-kline.service @@ -1,5 +1,7 @@ [Unit] Description=Bind kline socket with pseudo tty based on socat +Requires=um-service-config.service user-module.target +After=um-service-config.service user-module.target [Service] Type=simple @@ -7,15 +9,12 @@ ExecStart=/usr/bin/socat-socket-kline PIDFile=/var/run/socket-kline.pid -Environment=SOCAT_SOCKET_KLINE_IP='192.168.1.64' SOCAT_SOCKET_KLINE_PORT='2202' SOCAT_SOCKET_KLINE_MSS='' +EnvironmentFile=/etc/user-module/network.conf ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure RestartSec=10 -[Unit] -Wants=network-online.target -After=network-online.target [Install] -WantedBy=multi-user.target +WantedBy=user-module.target diff --git a/recipes-extended/socket-uart/files/socket-lin.service b/recipes-extended/socket-uart/files/socket-lin.service index acd487b..e5ccb61 100644 --- a/recipes-extended/socket-uart/files/socket-lin.service +++ b/recipes-extended/socket-uart/files/socket-lin.service @@ -1,5 +1,7 @@ [Unit] Description=Bind lin socket with pseudo tty based on socat +Requires=um-service-config.service user-module.target +After=um-service-config.service user-module.target [Service] Type=simple @@ -7,15 +9,11 @@ ExecStart=/usr/bin/socat-socket-lin PIDFile=/var/run/socket-lin.pid -Environment=SOCAT_SOCKET_LIN_IP='192.168.1.64' SOCAT_SOCKET_LIN_PORT='2200' SOCAT_SOCKET_LIN_MSS='' +EnvironmentFile=/etc/user-module/network.conf ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure RestartSec=10 -[Unit] -Wants=network-online.target -After=network-online.target - [Install] -WantedBy=multi-user.target +WantedBy=user-module.target diff --git a/recipes-extended/socket-uart/files/socket-uart.service b/recipes-extended/socket-uart/files/socket-uart.service index c17f48a..d1ad89b 100644 --- a/recipes-extended/socket-uart/files/socket-uart.service +++ b/recipes-extended/socket-uart/files/socket-uart.service @@ -1,5 +1,8 @@ [Unit] Description=Bind uart socket with pseudo tty based on socat +Requires=um-service-config.service user-module.target +After=um-service-config.service user-module.target + [Service] Type=simple @@ -7,15 +10,11 @@ ExecStart=/usr/bin/socat-socket-uart PIDFile=/var/run/socket-uart.pid -Environment=SOCAT_SOCKET_UART_IP='192.168.1.64' SOCAT_SOCKET_UART_PORT='2204' SOCAT_SOCKET_UART_MSS='' +EnvironmentFile=/etc/user-module/network.conf ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure RestartSec=10 -[Unit] -Wants=network-online.target -After=network-online.target - [Install] -WantedBy=multi-user.target +WantedBy=user-module.target diff --git a/recipes-extended/socket-uart/socket-uart_0.0.1.bb b/recipes-extended/socket-uart/socket-uart_0.0.1.bb index 98041f0..2cb50e7 100644 --- a/recipes-extended/socket-uart/socket-uart_0.0.1.bb +++ b/recipes-extended/socket-uart/socket-uart_0.0.1.bb @@ -15,7 +15,7 @@ SRC_URI = " \ S = "${WORKDIR}" -RDEPENDS_${PN} = "socat" +RDEPENDS_${PN} = "socat um-service-cfg" SYSTEMD_SERVICE_${PN} = " \