jyapayne/Sunshine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename 85-sunshine.rules to 60-sunshine.rules

Browse source 
This ensures the rules are evaluated before 73-seat-late.rules which
enables uaccess tag application for existing logged on users.
This commit is contained in:
Cameron Gutman 2024-03-10 19:35:51 -05:00
commit 3117fa57ec
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cmake/packaging/linux.cmake
View file

@ -3,7 +3,7 @@
install(DIRECTORY "${SUNSHINE_SOURCE_ASSETS_DIR}/linux/assets/" install(DIRECTORY "${SUNSHINE_SOURCE_ASSETS_DIR}/linux/assets/"
DESTINATION "${SUNSHINE_ASSETS_DIR}") DESTINATION "${SUNSHINE_ASSETS_DIR}")
if(${SUNSHINE_BUILD_APPIMAGE} OR ${SUNSHINE_BUILD_FLATPAK}) if(${SUNSHINE_BUILD_APPIMAGE} OR ${SUNSHINE_BUILD_FLATPAK})
install(FILES "${SUNSHINE_SOURCE_ASSETS_DIR}/linux/misc/85-sunshine.rules" install(FILES "${SUNSHINE_SOURCE_ASSETS_DIR}/linux/misc/60-sunshine.rules"
DESTINATION "${SUNSHINE_ASSETS_DIR}/udev/rules.d") DESTINATION "${SUNSHINE_ASSETS_DIR}/udev/rules.d")
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sunshine.service" install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sunshine.service"
DESTINATION "${SUNSHINE_ASSETS_DIR}/systemd/user") DESTINATION "${SUNSHINE_ASSETS_DIR}/systemd/user")
@ -11,7 +11,7 @@ else()
find_package(Systemd) find_package(Systemd)
find_package(Udev) find_package(Udev)
install(FILES "${SUNSHINE_SOURCE_ASSETS_DIR}/linux/misc/85-sunshine.rules" install(FILES "${SUNSHINE_SOURCE_ASSETS_DIR}/linux/misc/60-sunshine.rules"
DESTINATION "${UDEV_RULES_INSTALL_DIR}") DESTINATION "${UDEV_RULES_INSTALL_DIR}")
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sunshine.service" install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sunshine.service"
DESTINATION "${SYSTEMD_USER_UNIT_INSTALL_DIR}") DESTINATION "${SYSTEMD_USER_UNIT_INSTALL_DIR}")

2
docs/source/about/setup.rst
View file

@ -199,7 +199,7 @@ Install
.. code-block:: bash .. code-block:: bash
echo 'KERNEL=="uinput", SUBSYSTEM=="misc", OPTIONS+="static_node=uinput", TAG+="uaccess"' | \ echo 'KERNEL=="uinput", SUBSYSTEM=="misc", OPTIONS+="static_node=uinput", TAG+="uaccess"' | \
sudo tee /etc/udev/rules.d/85-sunshine.rules sudo tee /etc/udev/rules.d/60-sunshine.rules
#. Optionally, configure autostart service #. Optionally, configure autostart service

4
packaging/linux/AppImage/AppRun
View file

@ -46,7 +46,7 @@ echo "
function install() { function install() {
# user input rules # user input rules
# shellcheck disable=SC2002 # shellcheck disable=SC2002
cat "$SUNSHINE_SHARE_HERE/udev/rules.d/85-sunshine.rules" | sudo tee /etc/udev/rules.d/85-sunshine.rules cat "$SUNSHINE_SHARE_HERE/udev/rules.d/60-sunshine.rules" | sudo tee /etc/udev/rules.d/60-sunshine.rules
# sunshine service # sunshine service
mkdir -p ~/.config/systemd/user mkdir -p ~/.config/systemd/user
@ -79,7 +79,7 @@ function install() {
function remove() { function remove() {
# remove input rules # remove input rules
sudo rm -f /etc/udev/rules.d/85-sunshine.rules sudo rm -f /etc/udev/rules.d/60-sunshine.rules
# remove service # remove service
sudo rm -f ~/.config/systemd/user/sunshine.service sudo rm -f ~/.config/systemd/user/sunshine.service

4
packaging/linux/flatpak/scripts/additional-install.sh
View file

@ -7,7 +7,7 @@ echo Sunshine User Service has been installed.
echo Use [systemctl --user enable sunshine] once to autostart Sunshine on login. echo Use [systemctl --user enable sunshine] once to autostart Sunshine on login.
# Udev rule # Udev rule
UDEV=$(cat /app/share/sunshine/udev/rules.d/85-sunshine.rules) UDEV=$(cat /app/share/sunshine/udev/rules.d/60-sunshine.rules)
echo Configuring mouse permission. echo Configuring mouse permission.
flatpak-spawn --host pkexec sh -c "echo '$UDEV' > /etc/udev/rules.d/85-sunshine.rules" flatpak-spawn --host pkexec sh -c "echo '$UDEV' > /etc/udev/rules.d/60-sunshine.rules"
echo Restart computer for mouse permission to take effect. echo Restart computer for mouse permission to take effect.

2
packaging/linux/flatpak/scripts/remove-additional-install.sh
View file

@ -7,5 +7,5 @@ systemctl --user daemon-reload
echo Sunshine User Service has been removed. echo Sunshine User Service has been removed.
# Udev rule # Udev rule
flatpak-spawn --host pkexec sh -c "rm /etc/udev/rules.d/85-sunshine.rules" flatpak-spawn --host pkexec sh -c "rm /etc/udev/rules.d/60-sunshine.rules"
echo Mouse permission removed. Restart computer to take effect. echo Mouse permission removed. Restart computer to take effect.

0
src_assets/linux/misc/85-sunshine.rules → src_assets/linux/misc/60-sunshine.rules
View file