From 04ea02e887cf6285fdf4f2e77eb46cecf71f0d35 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 12 Aug 2013 17:58:15 +0200 Subject: [PATCH] installer: convert to systemd Signed-off-by: Stephan Raue --- packages/tools/installer/init.d/98_installer | 33 ------------------- packages/tools/installer/package.mk | 5 +++ .../installer/system.d/installer.service | 22 +++++++++++++ .../tools/installer/system.d/installer.target | 9 +++++ 4 files changed, 36 insertions(+), 33 deletions(-) delete mode 100644 packages/tools/installer/init.d/98_installer create mode 100644 packages/tools/installer/system.d/installer.service create mode 100644 packages/tools/installer/system.d/installer.target diff --git a/packages/tools/installer/init.d/98_installer b/packages/tools/installer/init.d/98_installer deleted file mode 100644 index 5c32584148..0000000000 --- a/packages/tools/installer/init.d/98_installer +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# Copyright (C) 2009-2010 OpenELEC.tv -# http://www.openelec.tv -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -# starting Installer -# -# runlevels: installer - -progress "starting Installer" - -chvt 1 -while true; do - /usr/bin/installer -done - -sync -poweroff diff --git a/packages/tools/installer/package.mk b/packages/tools/installer/package.mk index b99c8f0a2c..38d903c2c0 100644 --- a/packages/tools/installer/package.mk +++ b/packages/tools/installer/package.mk @@ -59,3 +59,8 @@ makeinstall_target() { cp $PKG_DIR/config/installer.conf $INSTALL/etc fi } + +post_install() { + enable_service installer.service +} + diff --git a/packages/tools/installer/system.d/installer.service b/packages/tools/installer/system.d/installer.service new file mode 100644 index 0000000000..a7afbad7db --- /dev/null +++ b/packages/tools/installer/system.d/installer.service @@ -0,0 +1,22 @@ +[Unit] +Description=XBMC Media Center +DefaultDependencies=no +Conflicts=shutdown.target +After=basic.target +Before=shutdown.target +Requires=installer.target + +[Service] +ExecStart=/usr/bin/installer +Type=idle +StandardInput=tty-force +StandardOutput=inherit +StandardError=inherit +KillMode=process + +# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash +# terminates cleanly. +KillSignal=SIGHUP + +[Install] +WantedBy=installer.target diff --git a/packages/tools/installer/system.d/installer.target b/packages/tools/installer/system.d/installer.target new file mode 100644 index 0000000000..de918ea12f --- /dev/null +++ b/packages/tools/installer/system.d/installer.target @@ -0,0 +1,9 @@ +[Unit] +Description=OpenELEC installer +Requires=basic.target +After=basic.target +Conflicts=rescue.target multi-user.target graphical.target +AllowIsolate=yes + +[Install] +Alias=default.target