Try to detect webcam before offering to configure

outpaddling · Jul 24, 2022 · 1a4e8ff · 1a4e8ff
1 parent 7dee26f
commit 1a4e8ff
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/desktop-installer b/desktop-installer
@@ -2853,9 +2853,13 @@ if [ $cups = y ]; then
 fi
 
 # As of 2019-07 interferes with uhid
-webcam=`auto-ask webcam-setup 'Configure webcam? (y/n)' n`
-if [ $webcam = y ]; then
-    auto-webcam-setup
+if grep -iq '^ugen.*camera' /var/run/dmesg.boot; then
+    webcam=`auto-ask webcam-setup 'Configure webcam? (y/n)' n`
+    if [ $webcam = y ]; then
+	auto-webcam-setup || true
+    fi
+else
+    printf "No webcam detected.\n"
 fi
 
 # After network_config