diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-04-23 17:29:46 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-05-29 09:16:49 +0200 |
| commit | bd09e8c6e1a91295945272340a6971baa5e7f7fd (patch) | |
| tree | 656b12c726a5b9aabc4f5050562cb7918833fd79 | |
| parent | 9ca37c33b9fc6d71e7c3d29e2a51cc035be2bf0d (diff) | |
| download | spectrum-bd09e8c6e1a91295945272340a6971baa5e7f7fd.tar spectrum-bd09e8c6e1a91295945272340a6971baa5e7f7fd.tar.gz spectrum-bd09e8c6e1a91295945272340a6971baa5e7f7fd.tar.bz2 spectrum-bd09e8c6e1a91295945272340a6971baa5e7f7fd.tar.lz spectrum-bd09e8c6e1a91295945272340a6971baa5e7f7fd.tar.xz spectrum-bd09e8c6e1a91295945272340a6971baa5e7f7fd.tar.zst spectrum-bd09e8c6e1a91295945272340a6971baa5e7f7fd.zip | |
host/rootfs: set WAYLAND_DISPLAY globally
It needs to be possible to spawn Wayland clients other than as children of the compositor, for example portal dialogs. Signed-off-by: Alyssa Ross <hi@alyssa.is>
| -rw-r--r-- | host/rootfs/Makefile | 2 | ||||
| -rw-r--r-- | host/rootfs/etc/s6-linux-init/env/WAYLAND_DISPLAY | 1 | ||||
| -rw-r--r-- | host/rootfs/etc/s6-linux-init/env/WAYLAND_DISPLAY.license | 2 | ||||
| -rw-r--r-- | host/rootfs/etc/s6-linux-init/env/XDG_RUNTIME_DIR | 1 | ||||
| -rw-r--r-- | host/rootfs/etc/s6-linux-init/env/XDG_RUNTIME_DIR.license | 2 | ||||
| -rw-r--r-- | host/rootfs/etc/s6-rc/weston/run | 3 |
6 files changed, 10 insertions, 1 deletions
diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile index e1569e5..8fd11c2 100644 --- a/host/rootfs/Makefile +++ b/host/rootfs/Makefile @@ -18,6 +18,8 @@ FILES = \ etc/mdev/wait \ etc/parse-devname \ etc/passwd \ + etc/s6-linux-init/env/WAYLAND_DISPLAY \ + etc/s6-linux-init/env/XDG_RUNTIME_DIR \ etc/s6-linux-init/run-image/service/getty-tty1/run \ etc/s6-linux-init/run-image/service/getty-tty2/run \ etc/s6-linux-init/run-image/service/getty-tty3/run \ diff --git a/host/rootfs/etc/s6-linux-init/env/WAYLAND_DISPLAY b/host/rootfs/etc/s6-linux-init/env/WAYLAND_DISPLAY new file mode 100644 index 0000000..5ff1a40 --- /dev/null +++ b/host/rootfs/etc/s6-linux-init/env/WAYLAND_DISPLAY @@ -0,0 +1 @@ +wayland-1 diff --git a/host/rootfs/etc/s6-linux-init/env/WAYLAND_DISPLAY.license b/host/rootfs/etc/s6-linux-init/env/WAYLAND_DISPLAY.license new file mode 100644 index 0000000..555b5d4 --- /dev/null +++ b/host/rootfs/etc/s6-linux-init/env/WAYLAND_DISPLAY.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: 2024 Alyssa Ross <hi@alyssa.is> +SPDX-License-Identifier: CC0-1.0 diff --git a/host/rootfs/etc/s6-linux-init/env/XDG_RUNTIME_DIR b/host/rootfs/etc/s6-linux-init/env/XDG_RUNTIME_DIR new file mode 100644 index 0000000..70a6671 --- /dev/null +++ b/host/rootfs/etc/s6-linux-init/env/XDG_RUNTIME_DIR @@ -0,0 +1 @@ +/run/user/0 diff --git a/host/rootfs/etc/s6-linux-init/env/XDG_RUNTIME_DIR.license b/host/rootfs/etc/s6-linux-init/env/XDG_RUNTIME_DIR.license new file mode 100644 index 0000000..555b5d4 --- /dev/null +++ b/host/rootfs/etc/s6-linux-init/env/XDG_RUNTIME_DIR.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: 2024 Alyssa Ross <hi@alyssa.is> +SPDX-License-Identifier: CC0-1.0 diff --git a/host/rootfs/etc/s6-rc/weston/run b/host/rootfs/etc/s6-rc/weston/run index df2d74e..2512c01 100644 --- a/host/rootfs/etc/s6-rc/weston/run +++ b/host/rootfs/etc/s6-rc/weston/run @@ -2,6 +2,8 @@ # SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> +unexport WAYLAND_DISPLAY + foreground { mkdir /run/user } foreground { umask 077 @@ -15,7 +17,6 @@ backtick HOME { homeof $user } -export XDG_RUNTIME_DIR /run/user/0 redirfd -r 0 /dev/tty1 importas -i home HOME |