summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorWill Woods <wwoods@redhat.com>2012-02-10 13:19:39 -0500
committerWill Woods <wwoods@redhat.com>2012-03-16 12:35:53 -0400
commit30638d68c1ca80e44d63848cc821823d4531aa0e (patch)
treeeaaecfb83b92facf1cc8450bf29bc88478422908 /data
parent0b7219e33cf3cc26e5bc36dc6b8dd786d095ac54 (diff)
downloadanaconda-30638d68c1ca80e44d63848cc821823d4531aa0e.tar.gz
anaconda-30638d68c1ca80e44d63848cc821823d4531aa0e.tar.xz
anaconda-30638d68c1ca80e44d63848cc821823d4531aa0e.zip
Move from loader.service to anaconda.service
Replace loader.service with anaconda.service, which starts anaconda directly. Make necessary changes to related files.
Diffstat (limited to 'data')
-rw-r--r--data/systemd/Makefile.am2
-rw-r--r--data/systemd/anaconda.service (renamed from data/systemd/loader.service)4
-rw-r--r--data/systemd/anaconda.target2
-rw-r--r--data/systemd/instperf.service2
4 files changed, 5 insertions, 5 deletions
diff --git a/data/systemd/Makefile.am b/data/systemd/Makefile.am
index 37a5eb1fc..589854cfa 100644
--- a/data/systemd/Makefile.am
+++ b/data/systemd/Makefile.am
@@ -18,5 +18,5 @@
# Author: Chris Lumens <clumens@redhat.com>
systemddir = /lib/systemd/system
-dist_systemd_DATA = anaconda-shell@.service anaconda.target loader.service instperf.service
+dist_systemd_DATA = anaconda-shell@.service anaconda.target anaconda.service instperf.service
MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/systemd/loader.service b/data/systemd/anaconda.service
index b6d9f4395..0bdb5c9b8 100644
--- a/data/systemd/loader.service
+++ b/data/systemd/anaconda.service
@@ -1,5 +1,5 @@
[Unit]
-Description=The anaconda loader
+Description=the anaconda installation program
Wants=instperf.service rsyslog.service udev-settle.service
After=instperf.service rsyslog.service udev-settle.service
@@ -7,6 +7,6 @@ After=instperf.service rsyslog.service udev-settle.service
Environment=HOME=/root MALLOC_CHECK_=2 MALLOC_PERTURB_=204 PATH=/usr/bin:/bin:/sbin:/usr/sbin:/mnt/sysimage/bin:/mnt/sysimage/usr/bin:/mnt/sysimage/usr/sbin:/mnt/sysimage/sbin PYTHONPATH=/tmp/updates TERM=linux
Type=oneshot
WorkingDirectory=/root
-ExecStart=/sbin/loader
+ExecStart=/usr/sbin/anaconda
StandardInput=tty-force
TimeoutSec=0
diff --git a/data/systemd/anaconda.target b/data/systemd/anaconda.target
index 844999e29..7796c89ea 100644
--- a/data/systemd/anaconda.target
+++ b/data/systemd/anaconda.target
@@ -4,4 +4,4 @@ Requires=basic.target
Conflicts=rescue.service rescue.target
After=basic.target rescue.service rescue.target
AllowIsolate=yes
-Wants=loader.service anaconda-shell@tty2.service anaconda-shell@hvc1.service
+Wants=anaconda.service anaconda-shell@tty2.service anaconda-shell@hvc1.service
diff --git a/data/systemd/instperf.service b/data/systemd/instperf.service
index 1e4430bae..df275ba68 100644
--- a/data/systemd/instperf.service
+++ b/data/systemd/instperf.service
@@ -1,7 +1,7 @@
[Unit]
ConditionKernelCommandLine=debug
Description=anaconda performance monitor
-Before=loader.service
+Before=anaconda.service
[Service]
WorkingDirectory=/