From 33dc37310fea769e5eedbc2615850c93961b44e1 Mon Sep 17 00:00:00 2001 From: graysky Date: Tue, 13 Jul 2021 17:40:05 -0400 Subject: [PATCH] x86_64: update for kodi.bin[1] 1. https://github.com/archlinux/svntogit-community/commit/50afcc355a5ff3be2fb43faff5c7e690420a3b8c#diff-3e341d2d9c67be01819b25b25d5e53ea3cdf3a38d28846cda85a195eb9b7203a --- README.md | 19 ++----------------- x86/init/kodi-gbm.service | 2 +- x86/init/kodi-wayland.service | 2 +- x86/init/kodi-x11.service | 2 +- 4 files changed, 5 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 8594224..f902141 100644 --- a/README.md +++ b/README.md @@ -20,24 +20,9 @@ Users of other distros can just run `make install` as the root user. Then, as t Note that the kodi user's home directory is `/var/lib/kodi/` in this example, NOT `/home/kodi/` like a regular user. #### Notes for users of non-Arch Linux distros -1. Arch Linux ships three discrete Kodi packages, each providing a different Kodi executable (`kodi-x11`, `kodi-wayland`, and `kodi-gbm`) but other distros may not do this and may ship a combined Kodi binary (called `kodi.bin`). If your distro ships `kodi.bin` rather than the discrete executables you must adjust the name of the Kodi executable in the `ExecStop=` line accordingly. Failure to do so will result in Kodi getting killed before it can perform exit tasks and can result in data loss to your profile. +1. Users of Ubuntu ≥20.0 will need to copy the contents of [sysusers.conf](https://github.com/graysky2/kodi-standalone-service/blob/master/x86/init/sysusers.conf) to `/etc/sysusers.d/kodi.conf` and uncomment the line adding kodi user to the `render` group. -Do this modification using a [systemd drop-in](https://wiki.archlinux.org/title/Systemd#Drop-in_files). - -Example: -``` -# systemctl edit kodi-x11 - -<< you are creating a drop-in >> - -[Service] -ExecStop= -ExecStop=/usr/bin/killall --user kodi --exact --wait kodi.bin -``` - -2. Users of Ubuntu ≥20.0 will need to copy the contents of [sysusers.conf](https://github.com/graysky2/kodi-standalone-service/blob/master/x86/init/sysusers.conf) to `/etc/sysusers.d/kodi.conf` and uncomment the line adding kodi user to the `render` group. - -3. Users of Ubuntu wishing the kodi user to access devices on `/dev/ttyxxxx`, will need to copy the contents of [sysusers.conf](https://github.com/graysky2/kodi-standalone-service/blob/master/x86/init/sysusers.conf) to `/etc/sysusers.d/kodi.conf` and uncomment the line adding the kodi user to the `dialout` group. +2. Users of Ubuntu wishing the kodi user to access devices on `/dev/ttyxxxx`, will need to copy the contents of [sysusers.conf](https://github.com/graysky2/kodi-standalone-service/blob/master/x86/init/sysusers.conf) to `/etc/sysusers.d/kodi.conf` and uncomment the line adding the kodi user to the `dialout` group. ## Usage Simply [start/enable](https://wiki.archlinux.org/index.php/Systemd#Using_units) the requisite service. diff --git a/x86/init/kodi-gbm.service b/x86/init/kodi-gbm.service index c1cc5a7..1f54051 100644 --- a/x86/init/kodi-gbm.service +++ b/x86/init/kodi-gbm.service @@ -13,7 +13,7 @@ PAMName=login TTYPath=/dev/tty1 Environment=WINDOWING=gbm ExecStart=/usr/lib/kodi/kodi-gbm -ExecStop=/usr/bin/killall --user kodi --exact --wait kodi-gbm +ExecStop=/usr/bin/killall --user kodi --exact --wait kodi.bin Restart=on-abort StandardInput=tty StandardOutput=journal diff --git a/x86/init/kodi-wayland.service b/x86/init/kodi-wayland.service index 1fe0920..ee4eb3b 100644 --- a/x86/init/kodi-wayland.service +++ b/x86/init/kodi-wayland.service @@ -14,7 +14,7 @@ PAMName=login TTYPath=/dev/tty1 Environment=WINDOWING=wayland ExecStart=/usr/bin/cage -- /usr/bin/kodi-standalone -ExecStop=/usr/bin/killall --user kodi --exact --wait kodi-wayland +ExecStop=/usr/bin/killall --user kodi --exact --wait kodi.bin Restart=on-abort StandardInput=tty StandardOutput=journal diff --git a/x86/init/kodi-x11.service b/x86/init/kodi-x11.service index 26774ab..2fb6a86 100644 --- a/x86/init/kodi-x11.service +++ b/x86/init/kodi-x11.service @@ -12,7 +12,7 @@ PAMName=login TTYPath=/dev/tty1 Environment=WINDOWING=x11 ExecStart=/usr/bin/xinit /usr/bin/kodi-standalone -- :0 -quiet -nolisten tcp vt1 -ExecStop=/usr/bin/killall --user kodi --exact --wait kodi-x11 +ExecStop=/usr/bin/killall --user kodi --exact --wait kodi.bin Restart=on-abort StandardInput=tty StandardOutput=journal