feat(usb-sync): sudoers, Move2USB verification, manual copy

- Installer/setup: sudoers.d 021 for www-data mount/umount; polkit and sudoers decoupled; remove legacy 020 rule.

- remotebuzzer Move2USB: expect copy.chk at USB root after rsync; check spawn errors.

- en.json: synctodrive and Move2USB manual strings; fix Automated typo.

Made-with: Cursor

Author: Photobooth

assets/js/remotebuzzer-server.js

@@ -592,6 +592,7 @@ function move2usbAction() {
         log('ERROR: Could not parse config, aborting move2usb');
         return;
     }
+    copySuccess = false;
     log('USB target ', parsedConfig.drive);
 
     const getDriveInfo = ({ drive }) => {
@@ -909,12 +910,10 @@ function move2usbAction() {
 
         fs.writeFileSync(path.join(dataAbsPath, 'copy.chk'), '', { flag: 'w' });
 
-        if (fs.existsSync(path.join(drive.mountpoint, 'data/copy.chk'))) {
+        const usbCheckfile = path.join(drive.mountpoint, 'copy.chk');
+        if (fs.existsSync(usbCheckfile)) {
             log(' ');
-            log(
-                '[WARNING] Last sync might not completed, Checkfile exists:',
-                path.join(drive.mountpoint, 'data/copy.chk')
-            );
+            log('[WARNING] Move2USB: stale copy.chk already on USB before rsync:', usbCheckfile);
             log(' ');
         }
 
@@ -951,26 +950,30 @@ function move2usbAction() {
 
         log('Executing command: <', cmd, '>');
 
-        try {
-            spawnSync(cmd, {
-                shell: '/bin/bash',
-                stdio: 'ignore'
-            });
-        } catch (err) {
-            log('ERROR: Could not start rsync:', err.toString());
+        const rsyncResult = spawnSync(cmd, {
+            shell: '/bin/bash',
+            stdio: 'ignore'
+        });
+        if (rsyncResult.error) {
+            log('ERROR: Could not start rsync:', rsyncResult.error.toString());
+
+            return;
+        }
+        if (rsyncResult.status !== 0) {
+            log('ERROR: rsync exited with code ' + rsyncResult.status);
 
             return;
         }
 
         log('Sync completed');
 
-        if (fs.existsSync(path.join(drive.mountpoint, 'data/copy.chk'))) {
+        if (fs.existsSync(usbCheckfile)) {
             copySuccess = true;
         } else {
             log(' ');
             log(
-                '[ERROR] Sync error, sync might be not successfull. Checkfile does not exist:',
-                path.join(drive.mountpoint, 'data/copy.chk')
+                '[ERROR] Move2USB: sync verification failed (copy.chk missing on USB after rsync, expected at):',
+                usbCheckfile
             );
             log(' ');
             copySuccess = false;
@@ -979,7 +982,7 @@ function move2usbAction() {
         }
 
         try {
-            fs.unlinkSync(path.join(drive.mountpoint, 'data/copy.chk'));
+            fs.unlinkSync(usbCheckfile);
         } catch (err) {
             log('Warning: Could not remove checkfile from USB: ' + err.message);
         }

assets/js/sync-to-drive.js

@@ -1269,17 +1269,20 @@ EOF
 }
 
 function install_usb_sudoers() {
-    local sudoers_file="/etc/sudoers.d/020_www-data-usb"
-
+    local sudoers_file="/etc/sudoers.d/021_www-data-usb-sync"
+    # Match manual helper scripts/setup-usb-sync.sh (portable paths; some distros use /bin vs /usr/bin).
     cat >"$sudoers_file" <<'EOF'
-# Photobooth USB sync: allow www-data to mount, unmount and create mountpoints
-www-data ALL=(ALL) NOPASSWD: /usr/bin/mount, /usr/bin/umount, /usr/bin/mkdir -p /media/*
+# Photobooth USB Sync — passwordless mount/umount/mkdir for www-data (sync-to-drive.js, move2usb).
+# Use together with Polkit rules for udisksctl; this covers sudo fallbacks in the Node scripts.
+Cmnd_Alias PHOTOBOOTH_USB_SYNC = /bin/mount, /usr/bin/mount, /bin/umount, /usr/bin/umount, /bin/mkdir -p /media/*, /usr/bin/mkdir -p /media/*
+www-data ALL=(root) NOPASSWD: PHOTOBOOTH_USB_SYNC
 EOF
 
     chmod 440 "$sudoers_file"
 
     if visudo -cf "$sudoers_file" >/dev/null 2>&1; then
         info "Setup" "Installed USB sudoers rule for www-data at $sudoers_file"
+        rm -f /etc/sudoers.d/020_www-data-usb 2>/dev/null || true
         return 0
     else
         error "Invalid sudoers file created at $sudoers_file. Please check manually."
@@ -1324,12 +1327,14 @@ function remove_polkit_usb_rule() {
     local PKLA_FILE="/etc/polkit-1/localauthority/50-local.d/photobooth.pkla"
     local RULES_FILE="/etc/polkit-1/rules.d/photobooth.rules"
     local LEGACY_RULES_FILE="/etc/polkit-1/rules.d/50-photobooth-udisks.rules"
-    local SUDOERS_FILE="/etc/sudoers.d/020_www-data-usb"
+    local SUDOERS_FILE_LEGACY="/etc/sudoers.d/020_www-data-usb"
+    local SUDOERS_FILE="/etc/sudoers.d/021_www-data-usb-sync"
     local REMOVED=false
 
     [[ -f "$PKLA_FILE" ]] && rm -f "$PKLA_FILE" && REMOVED=true
     [[ -f "$RULES_FILE" ]] && rm -f "$RULES_FILE" && REMOVED=true
     [[ -f "$LEGACY_RULES_FILE" ]] && rm -f "$LEGACY_RULES_FILE" && REMOVED=true
+    [[ -f "$SUDOERS_FILE_LEGACY" ]] && rm -f "$SUDOERS_FILE_LEGACY" && REMOVED=true
     [[ -f "$SUDOERS_FILE" ]] && rm -f "$SUDOERS_FILE" && REMOVED=true
 
     $REMOVED && return 0 || return 1
@@ -1404,18 +1409,15 @@ function disable_automount() {
 
 function set_usb_sync() {
     if whiptail --title "USB Sync" \
-        --yesno "Setup USB Sync policy?\n\nThis is needed to use the USB Sync feature of Photobooth.\nUSB Sync can be activated via Adminpanel." \
+        --yesno "Setup USB Sync policy?\n\nInstalls Polkit rules for udisksctl and sudoers for mount/umount/mkdir as www-data.\nAlso tries to disable desktop auto-mount to avoid permission conflicts.\nUSB Sync is enabled in the Admin panel." \
         12 60; then
 
-        if create_polkit_usb_rule; then
-            install_usb_sudoers
-            if disable_automount; then
-                confirm "USB Sync" "USB Sync policy created and auto mount settings updated successfully."
-            else
-                confirm "USB Sync" "USB Sync policy created, but no configuration file was found to adjust auto mount."
-            fi
+        create_polkit_usb_rule || warn "Polkit USB rule could not be created; udisksctl may still need manual policy."
+        install_usb_sudoers || warn "USB sudoers rule could not be installed; sudo mount fallbacks may fail."
+        if disable_automount; then
+            confirm "USB Sync" "USB Sync policy and auto-mount adjustments applied."
         else
-            confirm "USB Sync" "Failed to create USB Sync policy!"
+            confirm "USB Sync" "USB Sync Polkit/sudoers applied; no pcmanfm volume config found to adjust auto-mount."
         fi
 
     else

install-photobooth.sh

@@ -718,7 +718,7 @@
   "manual:remotebuzzer:remotebuzzer_custombutton": "If enabled, custom button action can be triggered via HTTP request.",
   "manual:remotebuzzer:remotebuzzer_enable_standalonegallery": "Controls whether the rotary encoder HTTP endpoints are active on the standalone gallery view.",
   "manual:remotebuzzer:remotebuzzer_input_device": "Linux input device for hardware triggers (e.g. /dev/input/by-id/...). Uses the per-action key codes (picture/collage/custom/print/video) to map incoming key events.",
-  "manual:remotebuzzer:remotebuzzer_move2usbbutton": "If enabled, Move2USB can be triggered via HTTP request.",
+  "manual:remotebuzzer:remotebuzzer_move2usbbutton": "If enabled, Move2USB can be triggered via HTTP request. Uses the same USB device identifier as USB Sync (<code>synctodrive</code> target in the admin panel). Requires the same Linux mount permissions as USB Sync (Polkit/sudoers for <code>www-data</code>; see USB Sync manual).",
   "manual:remotebuzzer:remotebuzzer_picturebutton": "If enabled, picrure can be triggered via HTTP request.",
   "manual:remotebuzzer:remotebuzzer_port": "Server TCP Port - example 14711.",
   "manual:remotebuzzer:remotebuzzer_printbutton": "If enabled, print can be triggered via HTTP request.",
@@ -758,9 +758,9 @@
   "manual:sound:sound_fallback_enabled": "Use EN sounds as fallback if the current language is not supported yet",
   "manual:sound:sound_test": "Play a random test sound",
   "manual:sound:sound_voice": "Which voice to use for sounds",
-  "manual:synctodrive:synctodrive_enabled": "Enable automatic syncing of new pictures to USB device using rsync",
-  "manual:synctodrive:synctodrive_interval": "Seconds to trigger syncing as interval",
-  "manual:synctodrive:synctodrive_target": "Pattern to identify USB device either by USB stick name (e.g. <code>photobooth</code>), device full path  (e.g <code>/dev/sda1</code>) or device subsystem (e.g. <code>sda</code>).",
+  "manual:synctodrive:synctodrive_enabled": "Enable automatic syncing of new pictures to a USB device using rsync. On Linux the web server user (<code>www-data</code>) must be allowed to mount the stick: the Photobooth install wizard can install Polkit rules and passwordless sudo for <code>mount</code>/<code>umount</code> (Permissions → USB Sync policy, or during install via general permissions). You can also run <code>scripts/setup-usb-sync.sh</code> as root after updates. Use a labelled FAT32 or exFAT volume where the label matches the identifier below.",
+  "manual:synctodrive:synctodrive_interval": "Seconds between automatic sync attempts (interval while the USB Sync process is running).",
+  "manual:synctodrive:synctodrive_target": "Pattern to identify the USB device: usually the volume label of the stick (e.g. <code>photobooth</code>), or the block device path (e.g. <code>/dev/sda1</code>) or short name (e.g. <code>sda1</code>). Must match a removable USB device.",
   "manual:theme_title": "Use the Themes box to save current theme fields, load another, export a ZIP (config + referenced images), or import that ZIP to install a theme. Import or save will overwrite an existing theme with the same name.",
   "manual:userinterface:background_admin": "Enter the path to the admin panel background image.",
   "manual:userinterface:background_chroma": "Enter the path to the chroma keying background image.",
@@ -1068,7 +1068,7 @@
   "success": "Successful!",
   "synctodrive": "USB Sync",
   "synctodrive:synctodrive_enabled": "Enable",
-  "synctodrive:synctodrive_interval": "Autmated syncing interval",
+  "synctodrive:synctodrive_interval": "Automated syncing interval",
   "synctodrive:synctodrive_target": "USB device identifier",
   "takeCollage": "Collage",
   "takePhoto": "Picture",