This finally seems to work

Author: foosel

scripts/10-install-camera-streamer

@@ -26,20 +26,17 @@ sed -i 's/^camera_auto_detect=0/camera_auto_detect=1/' /boot/config.txt
 # install default configs
 mkdir -p /boot/camera-streamer
 cp /files/camera-streamer/libcamera.conf /boot/camera-streamer/libcamera.conf
-cp /files/camera-streamer/usb.conf /boot/camera-streamer/usb.conf
+cp /files/camera-streamer/usb-default.conf /boot/camera-streamer/usb-default.conf
 
-# install libcamera service
-cp /files/camera-streamer/camera-streamer-libcamera.service /etc/systemd/system/camera-streamer-libcamera.service
-systemctl enable camera-streamer-libcamera.service
-
-# install USB camera service
+# install services
 cp /files/camera-streamer/camera-streamer-control /root/bin/camera-streamer-control
 chmod +x /root/bin/camera-streamer-control
 
-cp /files/camera-streamer/camera-streamer-usb@.service /etc/systemd/system/camera-streamer-usb@.service
-cp /files/camera-streamer/camera-streamer-usb@.path /etc/systemd/system/camera-streamer-usb@.path
 cp /files/camera-streamer/camera-streamer.service /etc/systemd/system/camera-streamer.service
+cp /files/camera-streamer/camera-streamer-libcamera.service /etc/systemd/system/camera-streamer-libcamera.service
+cp /files/camera-streamer/camera-streamer-usb@.service /etc/systemd/system/camera-streamer-usb@.service
 
+# Only enable the camera-streamer service, it will start the others as configured
 systemctl enable camera-streamer.service
 
 # install helper scripts
@@ -50,7 +47,48 @@ chmod +x /root/bin/add-usb-camera
 chmod +x /root/bin/remove-usb-camera
 chmod +x /root/bin/list-usb-cameras
 
-# clean up the old crap
+# clean up the old stuff
+cat > /boot/octopi.txt <<EOF
+### IMPORTANT: Looking for the camera settings? Those are now located
+### in the camera-streamer directory! libcamera.conf to configure the Raspberry Pi
+### camera and usb-default.conf to configure USB cameras. Read more about it here:
+### https://faq.octoprint.org/camera-streamer-config
+
+### Windows users: To edit this file use Notepad++, VSCode or SublimeText.
+### Do not use Notepad or WordPad.
+
+### MacOSX users: If you use Textedit to edit this file make sure to use
+### "plain text format" and "disable smart quotes" in "Textedit > Preferences"
+
+# Configuration of network monitoring
+#
+# This enables network monitoring for wifi connections with a simple ping test.
+# If connection terminates by variable reasons system tries to restart the wifi connection to reestablish a connection.
+# The connection test is done every minute.
+# By default it is disabled (0 = off / 1 = on)
+# destination_host can be an ip address or a hostname (for hostname ensure dns resosultion is working correctly)
+
+enable_network_monitor=0
+
+# Be sure to change this to match your network!
+destination_host=192.168.1.1
+
+### EXPERIMENTAL
+# Support for different streamer types.
+#
+# Available options:
+#   mjpeg [default] - camera-streamer
+#   hls - FFMPEG HLS streamer
+#camera_streamer=mjpeg
+EOF
+
+sed -i 's/webcamd\.service/camera-streamer.service/' /etc/systemd/system/streamer_select.service
+sed -i 's/webcamd\.service/camera-streamer.service/' /root/bin/streamer_select
+
 systemctl disable webcamd
+
+rm /etc/logrotate.d/webcamd
+rm /etc/systemd/system/webcamd.service
 rm /root/bin/webcamd
 rm -rf /opt/mjpg-streamer
+rm /home/pi/mjpg-streamer

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

@@ -17,7 +17,7 @@ if [ -z "$NAME" ]; then
 fi
 
 # make sure the name is unique
-if [ -e "/boot/camera-streamer/$NAME.conf" ]; then
+if [ -e "/boot/camera-streamer/usb-$NAME.conf" ]; then
   echo "Camera $NAME already exists"
   exit 1
 fi
@@ -63,7 +63,7 @@ if [ ! -e "$DEVICE" ]; then
   exit 1
 fi
 
-cat > /boot/camera-streamer/$NAME.conf <<EOF
+cat > /boot/camera-streamer/usb-$NAME.conf <<EOF
 ### Options for USB based cameras
 
 # The port on which the webcam server for the camera should listen on.
@@ -92,4 +92,4 @@ echo "Camera $NAME added"
 echo
 echo "Port:               $PORT"
 echo "Device:             $DEVICE"
-echo "Configuration file: /boot/camera-streamer/$NAME.conf"
+echo "Configuration file: /boot/camera-streamer/usb-$NAME.conf"

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

@@ -1,61 +1,49 @@
 #!/bin/bash
 
+if [ "$EUID" -ne 0 ]
+  then echo "Please run as root/with sudo"
+  exit 1
+fi
+
 action=$1
 single=$2
 
 [ -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
-  # skip the libcamera.conf
-  if [ "$conf" = "/boot/camera-streamer/libcamera.conf" ]; then
-    continue
-  fi
-
+for conf in /boot/camera-streamer/usb-*.conf; do
   # get the name of the camera
   name=$(basename "$conf" .conf)
+  name=${name#usb-}
 
   if [[ "$single" != "" ]] && [[ "$single" != "$name" ]]; then
     # if we are only doing a single camera, skip the others
     continue
   fi
 
   source $conf
+  [ -n "$DEVICE" ] || continue
 
   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
+    if ! grep -q "PathExistsGlob=$DEVICE" "$path_dir/camera-streamer-usb-$name.path"; then
+      echo "Adding path unit for autolaunch of camera-streamer-usb@$name"
       cat > "$path_dir/camera-streamer-usb-$name.path" <<EOF
 [Unit]
 Description=camera-streamer $name autolaunch
 After=network.target
 
 [Path]
-PathExists=$DEVICE
+PathExistsGlob=$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"
+      systemctl daemon-reload || true
     fi
-    [[ "$reload" == "yes" ]] && systemctl daemon-reload || true
   fi
 
   # do the action
+  echo "Running $action for camera-streamer-usb-$name.path..."
   systemctl $action "camera-streamer-usb-$name.path"
-  systemctl $action "camera-streamer-usb@$name.service"
+  echo "... done."
 done

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

@@ -1,12 +1,14 @@
 [Unit]
 Description=camera-streamer libcamera
 After=network.target
+ConditionPathExists=/etc/octopi_streamer/mjpeg
 StartLimitIntervalSec=120
 StartLimitBurst=10
 
 [Service]
 EnvironmentFile=/boot/camera-streamer/libcamera.conf
 ExecCondition=/bin/sh -c "/usr/bin/libcamera-hello --list-cameras | grep -o '/base/soc/[^)]*'"
+ExecCondition=/bin/sh -c "! ss -ltn src :$PORT | grep -q LISTEN"
 ExecStart=/bin/sh -c "exec /usr/local/bin/camera-streamer \
   -http-port=${PORT} \
   -camera-type=libcamera \

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

@@ -2,17 +2,20 @@
 Description=camera-streamer %i
 After=network.target
 After=camera-streamer-libcamera.service
-ConditionPathExists=/boot/camera-streamer/%i.conf
+ConditionPathExists=/boot/camera-streamer/usb-%i.conf
 ConditionPathExistsGlob=/dev/v4l/by-id/usb-*-video-index0
+ConditionPathExists=/etc/octopi_streamer/mjpeg
 StartLimitIntervalSec=120
 StartLimitBurst=10
 
 [Service]
-EnvironmentFile=/boot/camera-streamer/%i.conf
+EnvironmentFile=/boot/camera-streamer/usb-%i.conf
+ExecCondition=/bin/sh -c "[ -e $DEVICE ]"
+ExecCondition=/bin/sh -c "! ss -ltn src :$PORT | grep -q LISTEN"
 ExecStart=/bin/sh -c "exec /usr/local/bin/camera-streamer \
   -http-port=${PORT} \
-  -camera-path="${DEVICE}" \
   -camera-type=v4l2 \
+  -camera-path=$(ls -b $DEVICE | head -n1) \
   -camera-format=${FORMAT} \
   -camera-width=${WIDTH} -camera-height=${HEIGHT} \
   -camera-fps=${FRAMERATE} \

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

@@ -1,6 +1,7 @@
 [Unit]
-Description=camera-streamer arm usb
+Description=camera-streamer
 After=network.target
+ConditionPathExists=/etc/octopi_streamer/mjpeg
 
 [Service]
 Type=oneshot

scripts/files/camera-streamer/remove-usb-camera

@@ -12,14 +12,13 @@ if [ -z "$NAME" ]; then
   exit 1
 fi
 
-if [ ! -e "/boot/camera-streamer/$NAME.conf" ]; then
+if [ ! -e "/boot/camera-streamer/usb-$NAME.conf" ]; then
   echo "Camera $NAME does not exist"
   exit 1
 fi
 
 /root/bin/camera-streamer-control stop $NAME
 
-rm /boot/camera-streamer/$NAME.conf
+rm /boot/camera-streamer/usb-$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

scripts/files/camera-streamer/usb.conf …s/files/camera-streamer/usb-default.confscripts/files/camera-streamer/usb.conf renamed to scripts/files/camera-streamer/usb-default.conf scripts/files/camera-streamer/usb.conf renamed to scripts/files/camera-streamer/usb-default.conf

@@ -5,10 +5,8 @@
 # camera will be considered the one with 8080.
 PORT=8080
 
-# The path to the camera device. If you have only one camera, leave at /dev/video0.
-# Otherwise you'll need to find the path to the camera device. You can do this by
-# running the command 'ls echo /dev/v4l/by-id/usb-*-video-index0'.
-DEVICE=/dev/video0
+# The path to the camera device. Leave as is if you are using no or only one USB camera.
+DEVICE=/dev/v4l/by-id/usb-*-video-index0
 
 # The image format of the camera.
 FORMAT=YUYV