Switch camera-streamer options from - to --

Author: foosel

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

@@ -10,15 +10,15 @@ 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/bin/camera-streamer \
-  -http-port=${PORT} \
-  -camera-type=libcamera \
-  -camera-path=$(/usr/bin/libcamera-hello --list-cameras | grep -o '/base/soc/[^)]*' | head -n1) \
-  -camera-format=YUYV \
-  -camera-width=${WIDTH} -camera-height=${HEIGHT} \
-  -camera-video.height=${VIDEO_HEIGHT} \
-  -camera-snapshot.height=${SNAPSHOT_HEIGHT} \
-  -camera-fps=${FRAMERATE} \
-  -camera-nbufs=2 \
+  --http-port=${PORT} \
+  --camera-type=libcamera \
+  --camera-path=$(/usr/bin/libcamera-hello --list-cameras | grep -o '/base/soc/[^)]*' | head -n1) \
+  --camera-format=YUYV \
+  --camera-width=${WIDTH} --camera-height=${HEIGHT} \
+  --camera-video.height=${VIDEO_HEIGHT} \
+  --camera-snapshot.height=${SNAPSHOT_HEIGHT} \
+  --camera-fps=${FRAMERATE} \
+  --camera-nbufs=${NBUFS:-2} \
   ${OPTIONS}"
 
 DynamicUser=yes

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

@@ -13,13 +13,13 @@ 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/bin/camera-streamer \
-  -http-port=${PORT} \
-  -camera-type=v4l2 \
-  -camera-path=$(ls -b $DEVICE | head -n1) \
-  -camera-format=${FORMAT} \
-  -camera-width=${WIDTH} -camera-height=${HEIGHT} \
-  -camera-fps=${FRAMERATE} \
-  -camera-nbufs=2 \
+  --http-port=${PORT} \
+  --camera-type=v4l2 \
+  --camera-path=$(ls -b $DEVICE | head -n1) \
+  --camera-format=${FORMAT} \
+  --camera-width=${WIDTH} -camera-height=${HEIGHT} \
+  --camera-fps=${FRAMERATE} \
+  --camera-nbufs=${NBUFS:-2} \
   ${OPTIONS}"
 
 DynamicUser=yes

scripts/files/camera-streamer/libcamera.conf

@@ -19,4 +19,4 @@ SNAPSHOT_HEIGHT=1080
 FRAMERATE=15
 
 # Additional options. By default enables continuous auto focus (if possible).
-OPTIONS='-camera-options="AfMode=2" -camera-options="AfRange=2"'
+OPTIONS='--camera-options="AfMode=2" --camera-options="AfRange=2"'