[PATCH 1/2] Move dependency info into the unit files

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



---
 data/systemd/Makefile.am     |   10 +---------
 data/systemd/anaconda.target |    2 +-
 data/systemd/loader.service  |    4 ++--
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/data/systemd/Makefile.am b/data/systemd/Makefile.am
index 2042981..196e90d 100644
--- a/data/systemd/Makefile.am
+++ b/data/systemd/Makefile.am
@@ -17,14 +17,6 @@
 #
 # Author: Chris Lumens <clumens@xxxxxxxxxx>
 
-systemddir           = /lib/systemd/system
+systemddir = /lib/systemd/system
 dist_systemd_DATA = anaconda-shell.service anaconda.target loader.service instperf.service tmp.mount
-
 MAINTAINERCLEANFILES = Makefile.in
-
-install-exec-local:
-	mkdir -p $(DESTDIR)/lib/systemd/system/anaconda.target.wants
-	ln -sf /lib/systemd/system/anaconda-shell.service $(DESTDIR)/lib/systemd/system/anaconda.target.wants
-	ln -sf /lib/systemd/system/loader.service $(DESTDIR)/lib/systemd/system/anaconda.target.wants
-	ln -sf /lib/systemd/system/rsyslog.service $(DESTDIR)/lib/systemd/system/anaconda.target.wants
-	ln -sf /lib/systemd/system/udev-settle.service $(DESTDIR)/lib/systemd/system/anaconda.target.wants
diff --git a/data/systemd/anaconda.target b/data/systemd/anaconda.target
index ac6d6e1..844999e 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=anaconda-shell@tty2.service anaconda-shell@hvc1.service
+Wants=loader.service anaconda-shell@tty2.service anaconda-shell@hvc1.service
diff --git a/data/systemd/loader.service b/data/systemd/loader.service
index 81c43b5..b6d9f43 100644
--- a/data/systemd/loader.service
+++ b/data/systemd/loader.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=The anaconda loader
-Wants=instperf.service tmp.mount
-After=instperf.service tmp.mount
+Wants=instperf.service rsyslog.service udev-settle.service
+After=instperf.service rsyslog.service udev-settle.service
 
 [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
-- 
1.7.6.2

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux