mirror/bazzite
1
0
Fork 0
mirror of https://github.com/ublue-os/bazzite.git synced 2025-01-27 12:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Correct labels on waydroid for selinux (#639)

Browse Source
This commit is contained in:
Kyle Gospodnetich 2023-12-31 18:36:13 -08:00
parent ca9d13efd4
commit 160666462a
4 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Containerfile
View File

@ -422,6 +422,7 @@ RUN /tmp/image-info.sh && \
systemctl disable rpm-ostreed-automatic.timer && \ systemctl disable rpm-ostreed-automatic.timer && \
systemctl enable ublue-update.timer && \ systemctl enable ublue-update.timer && \
systemctl enable gamescope-workaround.service && \ systemctl enable gamescope-workaround.service && \
systemctl enable waydroid-workaround.service && \
systemctl enable bazzite-hardware-setup.service && \ systemctl enable bazzite-hardware-setup.service && \
systemctl enable tailscaled.service && \ systemctl enable tailscaled.service && \
systemctl enable dev-hugepages1G.mount && \ systemctl enable dev-hugepages1G.mount && \

2
system_files/desktop/shared/usr/lib/systemd/system/gamescope-workaround.service
View File

@ -5,7 +5,7 @@ After=local-fs.target
[Service] [Service]
Type=oneshot Type=oneshot
# Copy if it doens't exist # Copy if it doesn't exist
ExecStartPre=/usr/bin/bash -c "[ -x /usr/local/bin/.gamescope ] || /usr/bin/cp /usr/bin/gamescope /usr/local/bin/.gamescope" ExecStartPre=/usr/bin/bash -c "[ -x /usr/local/bin/.gamescope ] || /usr/bin/cp /usr/bin/gamescope /usr/local/bin/.gamescope"
# This is faster than using .mount unit. Also allows for the previous line/cleanup # This is faster than using .mount unit. Also allows for the previous line/cleanup
ExecStartPre=/usr/bin/mount --bind /usr/local/bin/.gamescope /usr/bin/gamescope ExecStartPre=/usr/bin/mount --bind /usr/local/bin/.gamescope /usr/bin/gamescope

20
system_files/desktop/shared/usr/lib/systemd/system/waydroid-workaround.service Normal file
View File

@ -0,0 +1,20 @@
[Unit]
Description=Workaround waydroid not having the correct label
ConditionPathExists=/usr/lib/waydroid
After=local-fs.target
[Service]
Type=oneshot
# Copy if it doesn't exist
ExecStartPre=/usr/bin/bash -c "[ -d /usr/local/lib/.waydroid ] || /usr/bin/cp -r /usr/lib/waydroid /usr/local/lib/.waydroid"
# This is faster than using .mount unit. Also allows for the previous line/cleanup
ExecStartPre=/usr/bin/mount --bind /usr/local/lib/.waydroid /usr/lib/waydroid
# Fix SELinux label
ExecStart=/usr/sbin/restorecon /usr/lib/waydroid
# Clean-up after ourselves
ExecStop=/usr/bin/umount /usr/lib/waydroid
ExecStop=/usr/bin/rm -r /usr/local/lib/.waydroid
RemainAfterExit=yes
[Install]
WantedBy=multi-user.target

1
system_files/desktop/shared/usr/lib/tmpfiles.d/waydroid-workaround.conf Normal file
View File

@ -0,0 +1 @@
C /usr/local/lib/.waydroid - - - - /usr/lib/waydroid