fix: enhance autologin configuration for GDM and update service management

Author: th33k

pi-node/setup.sh

@@ -144,39 +144,75 @@ WantedBy=timers.target
 UNIT
 
 systemctl daemon-reload
-systemctl enable display-kiosk.service
 systemctl enable display-update.timer
 
-# ── 5. Auto-login + start X ──
+# ── 5. Auto-login + start kiosk ──
 echo "[5/5] Configuring auto-login..."
 
 USER_HOME=$(getent passwd "$REAL_USER" | cut -d: -f6)
 
-mkdir -p /etc/systemd/system/getty@tty1.service.d
-cat > /etc/systemd/system/getty@tty1.service.d/autologin.conf << CONF
+# ── Detect display manager and configure autologin accordingly ──
+if command -v gdm3 >/dev/null 2>&1 || [[ -f /etc/gdm3/custom.conf ]]; then
+    # Ubuntu/GDM path
+    echo "  -> Detected GDM, configuring autologin..."
+    GDM_CONF=/etc/gdm3/custom.conf
+    if grep -q "^\[daemon\]" "$GDM_CONF" 2>/dev/null; then
+        # Update existing [daemon] section
+        sed -i "/^\[daemon\]/a AutomaticLoginEnable=true\nAutomaticLogin=$REAL_USER" "$GDM_CONF"
+    else
+        cat >> "$GDM_CONF" << GDMCONF
+
+[daemon]
+AutomaticLoginEnable=true
+AutomaticLogin=$REAL_USER
+GDMCONF
+    fi
+
+    # Use GNOME autostart .desktop entry (no X auth issues)
+    echo "  -> Installing GNOME autostart entry..."
+    mkdir -p "$USER_HOME/.config/autostart"
+    cat > "$USER_HOME/.config/autostart/display-kiosk.desktop" << DESKTOP
+[Desktop Entry]
+Type=Application
+Name=Display Kiosk
+Exec=bash -c 'SERVER_URL=\$(grep SERVER_URL /opt/display-node/config.env | cut -d= -f2); FLOOR_ID=\$(grep FLOOR_ID /opt/display-node/config.env | cut -d= -f2); sleep 5; chromium-browser --noerrdialogs --disable-infobars --kiosk --incognito --disable-translate --disable-features=TranslateUI --disable-session-crashed-bubble --disable-component-update --check-for-update-interval=31536000 --no-first-run --start-fullscreen "\${SERVER_URL}/display/\${FLOOR_ID}"'
+Hidden=false
+NoDisplay=false
+X-GNOME-Autostart-enabled=true
+DESKTOP
+    chown -R "$REAL_USER:$(id -gn "$REAL_USER")" "$USER_HOME/.config"
+
+    # Disable the systemd kiosk service (not needed with GDM+GNOME autostart)
+    systemctl disable display-kiosk.service 2>/dev/null || true
+
+    echo "  -> GDM autologin configured. Will use GNOME autostart for kiosk."
+
+else
+    # Raspberry Pi OS / lightdm / getty path
+    echo "  -> No GDM detected, using getty autologin + openbox..."
+    systemctl enable display-kiosk.service
+
+    mkdir -p /etc/systemd/system/getty@tty1.service.d
+    cat > /etc/systemd/system/getty@tty1.service.d/autologin.conf << CONF
 [Service]
 ExecStart=
 ExecStart=-/sbin/agetty --autologin $REAL_USER --noclear %I \$TERM
 CONF
 
-# only add auto‑start line if the user home exists
-if [[ -d "$USER_HOME" ]]; then
-    if ! grep -q "startx" "$USER_HOME/.bash_profile" 2>/dev/null; then
-        echo '[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && startx -- -nocursor' >> "$USER_HOME/.bash_profile"
-    fi
-fi
-
-# only configure openbox/autostart if the user home directory exists
-if [[ -d "$USER_HOME" ]]; then
-    mkdir -p "$USER_HOME/.config/openbox"
-    cat > "$USER_HOME/.config/openbox/autostart" << 'AUTOSTART'
+    if [[ -d "$USER_HOME" ]]; then
+        if ! grep -q "startx" "$USER_HOME/.bash_profile" 2>/dev/null; then
+            echo '[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && startx -- -nocursor' >> "$USER_HOME/.bash_profile"
+        fi
+        mkdir -p "$USER_HOME/.config/openbox"
+        cat > "$USER_HOME/.config/openbox/autostart" << 'AUTOSTART'
     xset s off
     xset s noblank
     xset -dpms
     unclutter -idle 0.5 -root &
     systemctl start display-kiosk &
 AUTOSTART
-    chown -R "$REAL_USER:$(id -gn "$REAL_USER")" "$USER_HOME/.config"
+        chown -R "$REAL_USER:$(id -gn "$REAL_USER")" "$USER_HOME/.config"
+    fi
 fi
 
 echo ""