serivce no longer requires /etc/X11/Xwrapper.config

This commit is contained in:
graysky 2015-01-04 15:27:57 -05:00
parent 25d836ad66
commit 900077d3de
3 changed files with 10 additions and 42 deletions

View File

@ -1,28 +0,0 @@
# Maintainer: graysky <graysky AT archlinux DOT us>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Brad Fanella <bradfanella@archlinux.us>
# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
# Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Maxime Gauduin <alucryd@gmail.com>
pkgname=kodi-standalone-service
pkgver=1.7
pkgrel=1
pkgdesc="Systemd service and user to autostart kodi at boot"
arch=('any')
url="https://wiki.archlinux.org/index.php/Kodi#Kodi-standalone-service"
license=('GPL')
depends=('systemd' 'xorg-server' 'xorg-xinit' 'kodi')
replaces=('xbmc-standalone-service')
install=readme.install
source=("https://github.com/graysky2/$pkgname/archive/v$pkgver.tar.gz")
sha256sums=('44a4f1ad4e800bf3973d164b403742b53789e7006ba113ed6b569e3e6353ac70')
package() {
install -Dm644 "$srcdir/$pkgname-$pkgver/init/kodi.service" \
"$pkgdir/usr/lib/systemd/system/kodi.service"
install -dm 700 "$pkgdir"/var/lib/kodi
chown 420:420 "$pkgdir"/var/lib/kodi
}

View File

@ -5,12 +5,8 @@ A simple systemd service file to run kodi in standalone mode.
* systemd
* xorg-server with xorg-xinit
## Post-install instructions
If using xorg version >=1.16 then create /etc/X11/Xwrapper.config containing this line:
allowed_users = anybody
Note that the systemd service requires /var/lib/kodi to be user kodi's homedir. See the readme.install which contains scriptlets used by the Arch Linux package system. Users of other distros can adapt the code therein.
## Note
Users no longer require `/etc/X11/Xwrapper.config` on the system anymore since the created X server becomes the [controlling process](http://www.freedesktop.org/software/systemd/man/systemd.exec.html#StandardInput=) of the VT to which it is bound.
## Credit
Credit for the service given to the Arch Linux maintainers of the official kodi package.

View File

@ -33,6 +33,14 @@ post_upgrade() {
echo "cp -a /var/lib/xbmc/.xbmc/* /var/lib/kodi/.kodi"
echo "chown -R kodi:kodi /var/lib/kodi"
fi
if [ "$(vercmp $2 1.8-1)" -lt 1 ]; then
if [[ -f /etc/X11/Xwrapper.config ]]; then
echo '-> It is no longer necessary to keep /etc/X11/Xwrapper.config for kodi to start properly.'
fi
else
/bin/true
fi
}
post_remove() {
@ -40,14 +48,6 @@ post_remove() {
getent group kodi > /dev/null 2>&1 && groupdel kodi
}
post_message() {
echo "Users of Xorg >=1.16 wishing to autostart kodi standalone"
echo "must create or modify /etc/X11/Xwrapper.config to contain"
echo "the following:"
echo
echo "allowed_users = anybody"
}
pre_install() {
/usr/bin/systemctl status xbmc.service &>/dev/null
if [[ $? -eq 0 ]]; then