aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2010-10-28 12:57:42 -0400
committerBill Nottingham <notting@redhat.com>2010-10-28 12:57:42 -0400
commit2f51ac69b5a56444344af3248e80dff2a51d5661 (patch)
tree6eb624683613347af48dcfe7cd7bc85babf0c6ea
parent4ba8d66cd61d412a709ee65c72a1398a5d861c2a (diff)
downloadinitscripts-2f51ac69b5a56444344af3248e80dff2a51d5661.tar
initscripts-2f51ac69b5a56444344af3248e80dff2a51d5661.tar.gz
initscripts-2f51ac69b5a56444344af3248e80dff2a51d5661.tar.bz2
initscripts-2f51ac69b5a56444344af3248e80dff2a51d5661.tar.xz
initscripts-2f51ac69b5a56444344af3248e80dff2a51d5661.zip
Use systemd versions of these services.
-rw-r--r--Makefile3
-rw-r--r--systemd/system/killall.service19
-rw-r--r--systemd/system/prefdm.service22
-rw-r--r--systemd/system/rc-local.service16
-rw-r--r--systemd/system/single.service29
5 files changed, 0 insertions, 89 deletions
diff --git a/Makefile b/Makefile
index f7409c77..4ae07556 100644
--- a/Makefile
+++ b/Makefile
@@ -118,10 +118,7 @@ install:
mkdir -p -m 755 $(ROOT)/lib/systemd/system/multi-user.target.wants
mkdir -p -m 755 $(ROOT)/lib/systemd/system/graphical.target.wants
- ln -s prefdm.service $(ROOT)/lib/systemd/system/display-manager.service
ln -s reboot.target $(ROOT)/lib/systemd/system/ctrl-alt-del.target
- ln -s ../rc-local.service $(ROOT)/lib/systemd/system/multi-user.target.wants
- ln -s ../display-manager.service $(ROOT)/lib/systemd/system/graphical.target.wants
mkdir -p -m 755 $(ROOT)/lib/systemd/system/local-fs.target.wants
mkdir -p -m 755 $(ROOT)/lib/systemd/system/basic.target.wants
mkdir -p -m 755 $(ROOT)/lib/systemd/system/sysinit.target.wants
diff --git a/systemd/system/killall.service b/systemd/system/killall.service
deleted file mode 100644
index 953dc19d..00000000
--- a/systemd/system/killall.service
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file is part of systemd.
-#
-# systemd 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 of the License, or
-# (at your option) any later version.
-
-[Unit]
-Description=Kill all processes
-DefaultDependencies=no
-Requires=shutdown.target
-After=shutdown.target
-RefuseManualStart=yes
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=-/etc/init.d/killall start
-StandardOutput=tty
diff --git a/systemd/system/prefdm.service b/systemd/system/prefdm.service
deleted file mode 100644
index 2e2396d7..00000000
--- a/systemd/system/prefdm.service
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file is part of systemd.
-#
-# systemd 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 of the License, or
-# (at your option) any later version.
-
-[Unit]
-Description=Display Manager
-After=syslog.target livesys-late.service rc-local.service
-
-# On Fedora gdm/X11 is on tty1. We explicitly cancel the getty here to
-# avoid any races around that.
-Conflicts=getty@tty1.service plymouth-quit.service
-
-[Service]
-ExecStart=/etc/X11/prefdm -nodaemon
-Restart=always
-RestartSec=0
-
-[Install]
-Alias=display-manager.service
diff --git a/systemd/system/rc-local.service b/systemd/system/rc-local.service
deleted file mode 100644
index 21ecfb23..00000000
--- a/systemd/system/rc-local.service
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file is part of systemd.
-#
-# systemd 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 of the License, or
-# (at your option) any later version.
-
-[Unit]
-Description=Local customization
-
-[Service]
-ExecStart=/etc/rc.local start
-TimeoutSec=0
-StandardOutput=tty
-RemainAfterExit=yes
-SysVStartPriority=99
diff --git a/systemd/system/single.service b/systemd/system/single.service
deleted file mode 100644
index 4264cd56..00000000
--- a/systemd/system/single.service
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file is part of systemd.
-#
-# systemd 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 of the License, or
-# (at your option) any later version.
-
-# See systemd.special(7) for details
-
-[Unit]
-Description=Rescue Shell
-DefaultDependencies=no
-Conflicts=multi-user.target shutdown.target
-After=basic.target
-Before=multi-user.target
-
-[Service]
-Type=simple
-EnvironmentFile=/etc/sysconfig/init
-Environment=HOME=/root
-ExecStartPre=-/bin/plymouth --hide-splash
-ExecStart=-/bin/bash -c "exec $SINGLE"
-ExecStopPost=/bin/systemctl default
-StandardInput=tty-force
-KillMode=process-group
-
-# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
-# terminates cleanly.
-KillSignal=SIGHUP