Skip to content
Snippets Groups Projects
Commit 722b5976 authored by nimrod's avatar nimrod
Browse files

Kodi: Use GBM and some updates.

Use GBM and remove X.org. Some small updates too.
parent 0bbf773e
No related branches found
No related tags found
No related merge requests found
Pipeline #4215 passed
# vim: filetype=systemd # vim: filetype=systemd
[Unit] [Unit]
Description=Kodi Media Center on %i Description=Kodi Media Center on %i
After=systemd-user-sessions.service sound.target network-online.target xorg.service After=systemd-user-sessions.service sound.target network-online.target
# Require the library to be mounted. # Require the library to be mounted.
After=srv-library.mount After=srv-library.mount
...@@ -18,8 +18,11 @@ User=kodi ...@@ -18,8 +18,11 @@ User=kodi
PAMName=login PAMName=login
SupplementaryGroups=audio SupplementaryGroups=audio
SupplementaryGroups=cdrom SupplementaryGroups=cdrom
SupplementaryGroups=input
SupplementaryGroups=render
SupplementaryGroups=video
Environment="DISPLAY=:0" Environment="DISPLAY=:0"
ExecStart=flatpak run --device=all --share=network --filesystem=/etc/group --filesystem=/srv/library tv.kodi.Kodi --standalone --windowing=x11 -fs ExecStart=flatpak run --device=all --share=network --filesystem=/etc/group --filesystem=/srv/library tv.kodi.Kodi --standalone --windowing=gbm -fs
Type=simple Type=simple
Restart=always Restart=always
RestartSec=5 RestartSec=5
......
# vim: filetype=systemd
[Unit]
Description=X Windows display server
After=systemd-user-sessions.service
# D-Bus is necessary for contacting logind. Logind is required.
Wants=dbus.socket
After=dbus.socket
Conflicts=getty@tty7.service
Before=graphical.target
# On systems without virtual consoles, don't start
ConditionPathExists=/dev/tty7
[Service]
User=kodi
SupplementaryGroups=input
SupplementaryGroups=tty
SupplementaryGroups=video
PAMName=login
ExecStart=startx
Type=simple
Restart=on-abort
RestartSec=5
KillMode=control-group
# A virtual terminal is needed.
TTYPath=/dev/tty7
TTYReset=yes
TTYVHangup=yes
TTYVTDisallocate=yes
# Fail to start if not controlling the tty.
StandardOutput=tty
StandardInput=tty
StandardError=journal
# Log this user with utmp, letting it show up with commands 'w' and 'who'.
UtmpIdentifier=tty7
UtmpMode=user
[Install]
WantedBy=graphical.target
...@@ -12,9 +12,7 @@ ...@@ -12,9 +12,7 @@
- plymouth-themes - plymouth-themes
- firmware-linux - firmware-linux
- udisks2 - udisks2
- unison
- upower - upower
- xorg
state: present state: present
update_cache: true update_cache: true
...@@ -32,8 +30,7 @@ ...@@ -32,8 +30,7 @@
- name: Enable boot splash - name: Enable boot splash
ansible.builtin.lineinfile: ansible.builtin.lineinfile:
backup: true backup: true
# yamllint disable-line rule:line-length line: GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"
line: GRUB_CMDLINE_LINUX_DEFAULT="quiet splash systemd.unified_cgroup_hierarchy=0"
path: /etc/default/grub path: /etc/default/grub
notify: notify:
- Update GRUB - Update GRUB
...@@ -86,29 +83,16 @@ ...@@ -86,29 +83,16 @@
system: true system: true
uid: '{{ 900 + idx }}' uid: '{{ 900 + idx }}'
notify: notify:
- Restart Xorg
- Restart Kodi - Restart Kodi
- name: Configure rootless Xorg
ansible.builtin.copy:
backup: true
content: |
allowed_users=anybody
dest: /etc/X11/Xwrapper.config
mode: 0o0644
notify:
- Restart Xorg
- name: Copy services - name: Copy services
with_items: &services with_items: &services
- xorg.service
- kodi.service - kodi.service
ansible.builtin.copy: ansible.builtin.copy:
dest: /etc/systemd/system/ dest: /etc/systemd/system/
mode: preserve mode: preserve
src: '{{ item }}' src: '{{ item }}'
notify: notify:
- Restart Xorg
- Restart Kodi - Restart Kodi
- name: Enable services - name: Enable services
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment