diff --git a/AGENTS.md b/AGENTS.md index c11e417..77353f9 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -79,17 +79,21 @@ cargo build --release --features native-viewer,viewer-sdl --bin uuremote-viewer [Unit] Description=UU Remote Linux host (unofficial) After=graphical-session.target + PartOf=graphical-session.target [Service] Environment=RUST_LOG=info - Environment=DISPLAY=:0 - # GNOME on Xorg usually needs: Environment=XAUTHORITY=/run/user//gdm/Xauthority ExecStart=%h/.local/bin/uuremote-server Restart=always RestartSec=5 [Install] - WantedBy=default.target + WantedBy=graphical-session.target ``` + Same as packaging/deb. GNOME/KDE import DISPLAY / WAYLAND_DISPLAY and start graphical-session.target; do not hard-code + DISPLAY there (it overrides the session's real one, XWayland is often :1); under default.target the unit can + start before WAYLAND_DISPLAY is imported and fall back to X11. Desktops without that target (Xfce, i3) and the Xvfb + virtual desktop need `WantedBy=default.target` plus an explicit `Environment=DISPLAY=...`; headless + (`UU_DESKTOP_BACKEND=none` + linger) needs `WantedBy=default.target` only (GNOME on Xorg outside the session: `XAUTHORITY=/run/user//gdm/Xauthority`). Find the real display/Xauthority with `loginctl show-session -p Display` / `ps -o args -C Xorg`. 5. `systemctl --user daemon-reload && systemctl --user enable --now uuremote-native.service` 6. Verify: `journalctl --user -u uuremote-native.service -f` must show diff --git a/README.en.md b/README.en.md index 1918f24..e11d258 100644 --- a/README.en.md +++ b/README.en.md @@ -211,17 +211,17 @@ machine, in `~/.config/uuremote/config.json` (mode 0600). [Unit] Description=UU Remote Linux host (unofficial) After=graphical-session.target +PartOf=graphical-session.target [Service] Environment=RUST_LOG=info -# X11 desktops need the display; on GNOME, XAUTHORITY is usually /run/user//gdm/Xauthority -Environment=DISPLAY=:0 +# GNOME/KDE import DISPLAY / WAYLAND_DISPLAY into the user manager and start graphical-session.target ExecStart=%h/.local/bin/uuremote-server Restart=always RestartSec=5 [Install] -WantedBy=default.target +WantedBy=graphical-session.target ``` ```sh @@ -233,6 +233,10 @@ journalctl --user -u uuremote-native.service -f # online once you see availabi If you have not logged in yet, the service opens the QR login window on your desktop. +Desktops that never start `graphical-session.target` (e.g. Xfce, i3) will not autostart this unit: change `[Install]` to +`WantedBy=default.target`, add `Environment=DISPLAY=:0` (your actual display) and `enable` again. Headless mode and the +virtual desktop below also need `default.target`. + ### 5. uinput virtual keyboard/mouse on Wayland (recommended) On Wayland (especially GNOME/KDE via the portal) the default input path needs portal consent and some keyboard layouts @@ -283,7 +287,7 @@ the same account cannot assist each other, an official restriction). ## Servers without a monitor **Headless mode** (terminal, file transfer and port mapping only): add `Environment=UU_DESKTOP_BACKEND=none` to the -service and run `loginctl enable-linger $USER`, so the systemd user manager (with `XDG_RUNTIME_DIR` and the user D-Bus) +service, change `[Install]` to `WantedBy=default.target` (`graphical-session.target` never starts without a login), and run `loginctl enable-linger $USER`, so the systemd user manager (with `XDG_RUNTIME_DIR` and the user D-Bus) starts at boot without a login. The viewer's remote desktop keeps showing "connecting" in this mode; that is expected. Log in once with `uuremote-server login --no-gui` (QR in the terminal). diff --git a/README.md b/README.md index 4e9d3ff..6b68add 100644 --- a/README.md +++ b/README.md @@ -194,17 +194,17 @@ FFmpeg 7 及以上会在依赖 `ffmpeg-sys-next` 里报 `avfft.h file not found` [Unit] Description=UU Remote Linux host (unofficial) After=graphical-session.target +PartOf=graphical-session.target [Service] Environment=RUST_LOG=info -# X11 桌面需要指明显示器;GNOME 的 XAUTHORITY 一般在 /run/user//gdm/Xauthority -Environment=DISPLAY=:0 +# GNOME/KDE 等桌面会把 DISPLAY / WAYLAND_DISPLAY 导入用户管理器,并启动 graphical-session.target ExecStart=%h/.local/bin/uuremote-server Restart=always RestartSec=5 [Install] -WantedBy=default.target +WantedBy=graphical-session.target ``` ```sh @@ -216,6 +216,9 @@ journalctl --user -u uuremote-native.service -f # 看到 availability=Some("re 如果还没有登录,服务会自动在桌面上弹出扫码窗口。 +Xfce、i3 等不启动 `graphical-session.target` 的桌面,按上面的写法开机不会自启:把 `[Install]` 改成 `WantedBy=default.target`, +并加上 `Environment=DISPLAY=:0`(按实际显示器填写),再重新 `enable`。下文的无头模式、虚拟桌面也要用 `default.target`。 + ### 5. Wayland 下使用 uinput 虚拟键鼠(推荐) Wayland(尤其是 GNOME/KDE portal)下,默认的键鼠注入要经过 portal 授权,部分键盘布局下还会丢符号(比如下划线)。 @@ -255,7 +258,7 @@ install -Dm644 contrib/desktop/uu-remote-linux-viewer.desktop ~/.local/share/app ## 没有显示器的服务器 **无头模式**:只要终端、文件传输和端口映射,不需要图形界面。在服务里加 `Environment=UU_DESKTOP_BACKEND=none`, -再执行 `loginctl enable-linger $USER`,这样开机后不用登录,systemd 用户服务(以及 `XDG_RUNTIME_DIR`、用户 D-Bus)也会自动启动。 +把 `[Install]` 改成 `WantedBy=default.target`(无人登录时 `graphical-session.target` 不会启动),再执行 `loginctl enable-linger $USER`,这样开机后不用登录,systemd 用户服务(以及 `XDG_RUNTIME_DIR`、用户 D-Bus)也会自动启动。 无头模式下控制端点「远程桌面」会一直显示正在连接,这是正常的。首次登录用 `uuremote-server login --no-gui` 在终端里扫码。 **群晖 / NAS(Docker)**:没有桌面的 NAS 可以用容器运行无头模式(文件传输、终端、端口映射)。