From 4410246b4e47498af0be7820d45b16155004aa67 Mon Sep 17 00:00:00 2001 From: viktorxda <35473052+viktorxda@users.noreply.github.com> Date: Sun, 10 Mar 2024 19:51:20 +0100 Subject: [PATCH] [no ci] rubyfpv: adjust init.d script (#1342) --- general/package/rubyfpv/files/S73ruby | 45 +++++++++---------- .../rubyfpv/files/{ruby_stop.sh => ruby_stop} | 1 + general/package/rubyfpv/rubyfpv.mk | 2 +- 3 files changed, 22 insertions(+), 26 deletions(-) rename general/package/rubyfpv/files/{ruby_stop.sh => ruby_stop} (92%) diff --git a/general/package/rubyfpv/files/S73ruby b/general/package/rubyfpv/files/S73ruby index 84c57eb4..3efd0fb4 100755 --- a/general/package/rubyfpv/files/S73ruby +++ b/general/package/rubyfpv/files/S73ruby @@ -1,31 +1,26 @@ #!/bin/sh -# -# Start ruby -# - -chip=$(ipcinfo -c) +hw=$(ipcinfo -c) fw=$(grep "BUILD_OPTION" "/etc/os-release" | cut -d= -f2) -echo "Chip: " > /tmp/ruby_boot.log -echo ${chip} >> /tmp/ruby_boot.log -echo "Firmware: " >> /tmp/ruby_boot.log -echo ${fw} >> /tmp/ruby_boot.log + +echo "Chipset = ${hw}" | logger -s -t RubyFPV +echo "Firmware = ${fw}" | logger -s -t RubyFPV case "$1" in - start) - if ! [ -f /etc/system.ok ]; then - tweaksys ${chip} - fi + start) + if ! [ -f /etc/system.ok ]; then + tweaksys ${hw} + fi + echo "Starting Ruby..." | logger -s -t RubyFPV + ruby_start + ;; - echo "Starting Ruby..." - echo "Starting Ruby..." >> /tmp/ruby_boot.log - /usr/sbin/ruby_start - ;; - stop) - echo "Stopping Ruby..." - echo "Stopping Ruby..." >> /tmp/ruby_boot.log - /usr/sbin/ruby_stop.sh - ;; - *) - echo "Usage: $0 {start|stop}" - exit 1 + stop) + echo "Stopping Ruby..." | logger -s -t RubyFPV + ruby_stop + ;; + + *) + echo "Usage: $0 {start|stop}" + exit 1 + ;; esac diff --git a/general/package/rubyfpv/files/ruby_stop.sh b/general/package/rubyfpv/files/ruby_stop similarity index 92% rename from general/package/rubyfpv/files/ruby_stop.sh rename to general/package/rubyfpv/files/ruby_stop index 9100cde8..e3d40645 100755 --- a/general/package/rubyfpv/files/ruby_stop.sh +++ b/general/package/rubyfpv/files/ruby_stop @@ -1,3 +1,4 @@ +#!/bin/sh killall -q ruby_start killall -q ruby_rx_commands killall -q ruby_tx_telemetry diff --git a/general/package/rubyfpv/rubyfpv.mk b/general/package/rubyfpv/rubyfpv.mk index 1fc5d5ae..2e6881ac 100644 --- a/general/package/rubyfpv/rubyfpv.mk +++ b/general/package/rubyfpv/rubyfpv.mk @@ -23,7 +23,7 @@ define RUBYFPV_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/sbin $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/sbin $(@D)/output/* - $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/sbin $(RUBYFPV_PKGDIR)/files/ruby_stop.sh + $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/sbin $(RUBYFPV_PKGDIR)/files/ruby_stop $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/sbin $(RUBYFPV_PKGDIR)/files/version_ruby_base.txt endef