WIP: hotplug working

Author: foosel

scripts/files/camera-streamer/add-usb-camera

@@ -63,7 +63,7 @@ if [ ! -e "$DEVICE" ]; then
   exit 1
 fi
 
-sudo cat > /boot/camera-streamer/$NAME.conf <<EOF
+cat > /boot/camera-streamer/$NAME.conf <<EOF
 ### Options for USB based cameras
 
 # The port on which the webcam server for the camera should listen on.
@@ -82,11 +82,11 @@ HEIGHT=720
 # The framerate to set on the camera. Defaults to 15fps.
 FRAMERATE=15
 
-# Additional options. Leave at log-debug=0 if not needed.
-OPTIONS='-log-debug=0'
+# Additional options.
+OPTIONS=
 EOF
 
-sudo systemctl start camera-streamer-usb@$NAME.path
+/root/bin/camera-streamer-control restart $NAME
 
 echo "Camera $NAME added"
 echo

scripts/files/camera-streamer/camera-streamer-control

@@ -1,8 +1,9 @@
 #!/bin/bash
 
 action=$1
+single=$2
 
-systemctl $action "camera-streamer-libcamera.service"
+[ -n "$single" ] || systemctl $action "camera-streamer-libcamera.service"
 
 # iterate over all the camera confs in /boot/camera-streamer
 for conf in /boot/camera-streamer/*.conf; do
@@ -14,7 +15,47 @@ for conf in /boot/camera-streamer/*.conf; do
   # get the name of the camera
   name=$(basename "$conf" .conf)
 
-  # enable the camera
-  systemctl $action "camera-streamer-usb@$name.path"
+  if [[ "$single" != "" ]] && [[ "$single" != "$name" ]]; then
+    # if we are only doing a single camera, skip the others
+    continue
+  fi
+
+  source $conf
+
+  if [[ "$action" == "start" ]] || [[ "$action" == "restart" ]]; then
+    # generate some additional files/config if we are starting this for the first time
+    reload="no"
+
+    # Add runtime path unit file that starts the service when the device is plugged in
+    path_dir="/run/systemd/system"
+    if [[ ! -e "$path_dir/camera-streamer-usb-$name.path" ]] || [[ ! $(grep -q "PathExists=$DEVICE" "$path_dir/camera-streamer-usb-$name.path") ]]; then
+      cat > "$path_dir/camera-streamer-usb-$name.path" <<EOF
+[Unit]
+Description=camera-streamer $name autolaunch
+After=network.target
+
+[Path]
+PathExists=$DEVICE
+Unit=camera-streamer-usb@$name.service
+EOF
+      reload="yes"
+    fi
+
+    # Add path dependency to service file via runtime override
+    override_dir="/run/systemd/system/camera-streamer-usb@$name.service.d"
+    override_conf="$override_dir/override.conf"
+    if [[ ! -e "$override_conf" ]] || [[! $(grep -q "ConditionPathExists=$DEVICE" "$override_conf") ]]; then
+      mkdir -p "$override_dir"
+      cat > "$override_conf" <<EOF
+[Unit]
+ConditionPathExists=$DEVICE
+EOF
+      reload="yes"
+    fi
+    [[ "$reload" == "yes" ]] && systemctl daemon-reload || true
+  fi
+
+  # do the action
+  systemctl $action "camera-streamer-usb-$name.path"
   systemctl $action "camera-streamer-usb@$name.service"
 done

scripts/files/camera-streamer/camera-streamer-usb@.path

@@ -2,13 +2,13 @@
 Description=camera-streamer %i
 After=network.target
 After=camera-streamer-libcamera.service
+ConditionPathExists=/boot/camera-streamer/%i.conf
 ConditionPathExistsGlob=/dev/v4l/by-id/usb-*-video-index0
 StartLimitIntervalSec=120
 StartLimitBurst=10
 
 [Service]
 EnvironmentFile=/boot/camera-streamer/%i.conf
-ExecCondition=/bin/sh -c "[ -e $DEVICE ]"
 ExecStart=/bin/sh -c "exec /usr/local/bin/camera-streamer \
   -http-port=${PORT} \
   -camera-path="${DEVICE}" \

scripts/files/camera-streamer/camera-streamer-usb@.service

@@ -1,7 +1,6 @@
 [Unit]
 Description=camera-streamer arm usb
 After=network.target
-After=camera-streamer-libcamera
 
 [Service]
 Type=oneshot

scripts/files/camera-streamer/camera-streamer.service

@@ -17,6 +17,9 @@ if [ ! -e "/boot/camera-streamer/$NAME.conf" ]; then
   exit 1
 fi
 
-systemctl stop camera-streamer-usb@$NAME.path
-systemctl stop camera-streamer-usb@$NAME.service
+/root/bin/camera-streamer-control stop $NAME
+
 rm /boot/camera-streamer/$NAME.conf
+rm /run/systemd/system/camera-streamer-usb-$NAME.path || true
+rm -r /run/systemd/system/camera-streamer-usb@$NAME.service.d || true
+systemctl daemon-reload