Always enable the services

Laixer · Aug 16, 2023 · 13c77ca · 13c77ca
1 parent 1ad2061
commit 13c77ca
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 19 deletions.
diff --git a/contrib/deb/postinst b/contrib/deb/postinst
@@ -69,28 +69,37 @@ if [ ! -e "$FILE_PATH" ]; then
   echo "..done"
 fi
 
-# Reload the systemd daemon to pick up the new service files
-if command -v systemctl &> /dev/null; then
-  echo -n "Reloading systemd units.."
-  systemctl daemon-reload
-  echo "..done"
-fi
-
 # Load the udev rules
 if command -v udevadm &> /dev/null; then
   echo -n "Reloading udev rules.."
   udevadm control --reload-rules
   echo "..done"
 fi
 
-# Restart the glonax services
-if command -v systemctl &> /dev/null; then
-  echo -n "Restarting glonax services.."
-  if systemctl is-active glonax-proxy.service &> /dev/null; then
-    systemctl restart glonax-proxy.service
-  fi
-  if systemctl is-active glonax-agent.service &> /dev/null; then
-    systemctl restart glonax-agent.service
+start_glonax_service() {
+  local SERVICE_NAME="$1"
+
+  if systemctl is-active "$SERVICE_NAME" &> /dev/null; then
+    echo -n "Restarting $SERVICE_NAME.."
+    systemctl restart "$SERVICE_NAME"
+    echo "..done"
+  else
+    echo -n "Starting $SERVICE_NAME.."
+    systemctl start "$SERVICE_NAME"
+    echo "..done"
   fi
+  echo -n "Enabling $SERVICE_NAME.."
+  systemctl enable "$SERVICE_NAME"
   echo "..done"
+}
+
+# Start the glonax services
+if command -v systemctl &> /dev/null; then
+  # Reload the systemd daemon to pick up the new service files
+  echo -n "Reloading systemd units.."
+  systemctl daemon-reload
+  echo "..done"
+
+  start_glonax_service glonax-proxy.service
+  start_glonax_service glonax-agent.service
 fi
diff --git a/contrib/systemd/glonax-agent.service b/contrib/systemd/glonax-agent.service
@@ -13,7 +13,6 @@ RestartSec=2
 Nice=5
 User=glonax
 Group=glonax
-ExecStartPre=/bin/sleep 10
 ExecStart=/usr/local/bin/glonax-agent --daemon
 PrivateTmp=true
 

diff --git a/contrib/systemd/glonax-gnss.service b/contrib/systemd/glonax-gnss.service
@@ -12,7 +12,6 @@ Restart=always
 RestartSec=2
 User=glonax
 Group=glonax
-ExecStartPre=/bin/sleep 5
 ExecStart=/usr/local/bin/glonax-gnssd --daemon /dev/ttyACM0
 PrivateTmp=true
 

diff --git a/contrib/systemd/glonax-input.service b/contrib/systemd/glonax-input.service
@@ -2,14 +2,14 @@
 Description=Glonax Input Event Handler
 StartLimitIntervalSec=5
 StartLimitBurst=5
-After=bluetooth.target
+#After=bluetooth.target
 ConditionPathExists=/dev/input/js0
 
 [Service]
 WorkingDirectory=/var/lib/glonax
 Restart=always
 RestartSec=2
-ExecStart=/usr/local/bin/glonax-inputd --daemon /dev/input/js0
+ExecStart=/usr/local/bin/glonax-input --daemon /dev/input/js0
 PrivateTmp=true
 
 [Install]