diff options
| author | Simon Rettberg | 2020-10-02 09:05:16 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2020-10-02 09:05:16 +0200 |
| commit | 9ff471e00f686cea9d5046d64adb3fcbe44a0b46 (patch) | |
| tree | f778ed25292f0041dc86731ebdcf7ba61d58c4cd /core/modules/remote-access | |
| parent | [dhcpc-busybox] Re-enable running DHCP client on non-primary bridges (diff) | |
| download | mltk-9ff471e00f686cea9d5046d64adb3fcbe44a0b46.tar.gz mltk-9ff471e00f686cea9d5046d64adb3fcbe44a0b46.tar.xz mltk-9ff471e00f686cea9d5046d64adb3fcbe44a0b46.zip | |
[remote-access] Split noinput xorg config from zaphodhead config
Diffstat (limited to 'core/modules/remote-access')
| -rw-r--r-- | core/modules/remote-access/data/opt/openslx/remote-access/xorg-noinput.conf | 4 | ||||
| -rw-r--r-- | core/modules/remote-access/data/opt/openslx/remote-access/xorg-zaphod.conf (renamed from core/modules/remote-access/data/opt/openslx/remote-access/xorg.conf) | 5 | ||||
| -rwxr-xr-x | core/modules/remote-access/data/opt/openslx/scripts/systemd-remote_x_config | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/core/modules/remote-access/data/opt/openslx/remote-access/xorg-noinput.conf b/core/modules/remote-access/data/opt/openslx/remote-access/xorg-noinput.conf new file mode 100644 index 00000000..af856fb4 --- /dev/null +++ b/core/modules/remote-access/data/opt/openslx/remote-access/xorg-noinput.conf @@ -0,0 +1,4 @@ +Section "InputClass" + Identifier "noinput" + Option "Ignore" "on" +EndSection diff --git a/core/modules/remote-access/data/opt/openslx/remote-access/xorg.conf b/core/modules/remote-access/data/opt/openslx/remote-access/xorg-zaphod.conf index 0c411a96..a52ebfac 100644 --- a/core/modules/remote-access/data/opt/openslx/remote-access/xorg.conf +++ b/core/modules/remote-access/data/opt/openslx/remote-access/xorg-zaphod.conf @@ -54,8 +54,3 @@ Section "ServerFlags" Option "Xinerama" "off" EndSection -Section "InputClass" - Identifier "noinput" - Option "Ignore" "on" -EndSection - diff --git a/core/modules/remote-access/data/opt/openslx/scripts/systemd-remote_x_config b/core/modules/remote-access/data/opt/openslx/scripts/systemd-remote_x_config index fd2a708c..075fd5a1 100755 --- a/core/modules/remote-access/data/opt/openslx/scripts/systemd-remote_x_config +++ b/core/modules/remote-access/data/opt/openslx/scripts/systemd-remote_x_config @@ -4,6 +4,9 @@ [ -n "$SLX_REMOTE_VNC" ] || exit 0 # Nothing to do +# Disable all input drivers +cp "/opt/openslx/remote-access/xorg-noinput.conf" "/etc/X11/xorg.conf.d/16-remote-access-noinput.conf" + # Find connected output, get driver for according card driver= fallback= @@ -41,7 +44,7 @@ exit 0 [ "$driver" = "intel" ] || exit 0 # Currently only intel supports zaphod head split # Enable the dual-screen setup -sed "s/%DRIVER%/$driver/g" "/opt/openslx/remote-access/xorg.conf" > "/etc/X11/xorg.conf.d/16-remote-access.conf" +sed "s/%DRIVER%/$driver/g" "/opt/openslx/remote-access/xorg-zaphod.conf" > "/etc/X11/xorg.conf.d/16-remote-access-zaphod.conf" # Force :0.0 usage |