From 539b27e4c98c253f2ab2f1edc9f029da1e365019 Mon Sep 17 00:00:00 2001 From: Brad Stein Date: Fri, 6 Jun 2025 00:41:32 -0500 Subject: [PATCH] updates --- scripts/install-server.sh | 3 ++- scripts/navka-core.sh | 4 ++-- server/src/main.rs | 2 -- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/install-server.sh b/scripts/install-server.sh index 2a6fe16..f55e172 100755 --- a/scripts/install-server.sh +++ b/scripts/install-server.sh @@ -46,6 +46,7 @@ Type=oneshot ExecStart=/usr/local/bin/navka-core.sh RemainAfterExit=yes CapabilityBoundingSet=CAP_SYS_ADMIN +MountFlags=slave [Install] WantedBy=multi-user.target UNIT @@ -65,4 +66,4 @@ UNIT sudo systemctl daemon-reload sudo systemctl enable --now navka-core.service navka-server.service sudo systemctl restart navka-core.service navka-server.service -echo "✅ navka-server installed and running." +echo "✅ navka-server installed and restarted..." diff --git a/scripts/navka-core.sh b/scripts/navka-core.sh index 27b5af2..da07108 100644 --- a/scripts/navka-core.sh +++ b/scripts/navka-core.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash # Proven Pi-5 configfs gadget: HID keyboard+mouse + stereo UAC2 set -euo pipefail -modprobe libcomposite -# mountpoint -q /sys/kernel/config || mount -t configfs configfs /sys/kernel/config +modprobe libcomposite || { echo "libcomposite not in kernel; abort" >&2; exit 1; } +mountpoint -q /sys/kernel/config || mount -t configfs configfs /sys/kernel/config G=/sys/kernel/config/usb_gadget/navka if [[ -d $G ]]; then diff --git a/server/src/main.rs b/server/src/main.rs index 800dc6f..c1cc092 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -6,7 +6,6 @@ use tokio::{fs::OpenOptions, io::AsyncWriteExt}; use tokio_stream::{wrappers::ReceiverStream, Stream, StreamExt}; use tonic::{transport::Server, Request, Response, Status}; use tracing::{info, error}; -use tracing_subscriber::FmtSubscriber; use navka_common::navka::{ relay_server::{Relay, RelayServer}, @@ -33,7 +32,6 @@ impl Relay for Handler { tokio::spawn(async move { while let Some(msg) = in_stream.next().await.transpose()? { - // 1) write to /dev/hidg0 let data = msg.data.get(..8).ok_or_else(|| Status::invalid_argument("short"))?; { let mut f = hid.lock().await;