remove spaces from service

This commit is contained in:
graysky 2016-03-28 09:41:37 -04:00
parent 4c9f9d0261
commit 1d9889f2ee
2 changed files with 9 additions and 68 deletions

View File

@ -1,17 +1,17 @@
[Unit]
Description = Starts instance of Kodi using xinit
After = systemd-user-sessions.service network.target sound.target mysqld.service
Description=Starts instance of Kodi using xinit
After=systemd-user-sessions.service network.target sound.target mysqld.service
Conflicts=getty@tty7.service
[Service]
User = kodi
Group = kodi
User=kodi
Group=kodi
PAMName=login
Type = simple
Type=simple
TTYPath=/dev/tty7
ExecStart = /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/bin/kodi-standalone -- :0 -nolisten tcp vt7
Restart = on-abort
StandardInput = tty
ExecStart=/usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/bin/kodi-standalone -- :0 -nolisten tcp vt7
Restart=on-abort
StandardInput=tty
[Install]
WantedBy = multi-user.target
WantedBy=multi-user.target

View File

@ -1,59 +0,0 @@
post_install() {
getent group kodi > /dev/null || groupadd -g 420 kodi
if ! getent passwd kodi > /dev/null; then
useradd -c 'kodi user' -u 420 -g kodi -G audio,video,network,optical \
-d /var/lib/kodi -s /usr/bin/nologin kodi
passwd -l kodi > /dev/null
[[ ! -d /var/lib/kodi/.kodi ]] &&
mkdir /var/lib/kodi/.kodi &&
chown -R kodi:kodi /var/lib/kodi/.kodi
fi
}
post_upgrade() {
post_install $1
if ! getent group kodi | cut -d: -f3 | grep 420 > /dev/null 2>&1; then
groupmod -g 420 kodi > /dev/null 2>&1
fi
if ! id -u kodi | grep 420 > /dev/null 2>&1; then
usermod -u 420 kodi > /dev/null 2>&1
if [[ $? -ne 0 ]]; then
echo "Changing uid of user kodi failed."
echo "It is recommended that the uid is changed."
echo "Stop all processes running under the kodi user and reinstall kodi"
echo "or change the uid manually. (usermod -u 420 kodi)"
fi
chown -R kodi:kodi /var/lib/kodi
fi
if [[ -d /var/lib/xbmc ]]; then
echo "If you are upgrading from xbmc->kodi and wish to keep your"
echo "settings, simply follow these steps after the install:"
echo
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() {
getent passwd kodi > /dev/null 2>&1 && userdel kodi
getent group kodi > /dev/null 2>&1 && groupdel kodi
}
pre_install() {
/usr/bin/systemctl status xbmc.service &>/dev/null
if [[ $? -eq 0 ]]; then
# xbmc is running via this service
/usr/bin/systemctl stop xbmc.service &>/dev/null
else
/bin/true
fi
}