A lot of the stuff loader.service currently requires (udev, syslog, dbus, etc.) is started by basic.target, so let's have anaconda.target start after basic.target (much like multi-user.target) and simplify loader.service's requirements. (also, there's no such thing as dbus.target) --- data/systemd/Makefile.am | 3 --- data/systemd/anaconda.target | 4 ++++ data/systemd/loader.service | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/data/systemd/Makefile.am b/data/systemd/Makefile.am index 4654695..16975ac 100644 --- a/data/systemd/Makefile.am +++ b/data/systemd/Makefile.am @@ -25,8 +25,5 @@ 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/dbus.target $(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/sockets.target $(DESTDIR)/lib/systemd/system/anaconda.target.wants - ln -sf /lib/systemd/system/udev.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 bcbfb8e..1886399 100644 --- a/data/systemd/anaconda.target +++ b/data/systemd/anaconda.target @@ -1,2 +1,6 @@ [Unit] Description=The anaconda installation program +Requires=basic.target +Conflicts=rescue.service rescue.target +After=basic.target rescue.service rescue.target +AllowIsolate=yes diff --git a/data/systemd/loader.service b/data/systemd/loader.service index 100352c..81c43b5 100644 --- a/data/systemd/loader.service +++ b/data/systemd/loader.service @@ -1,7 +1,7 @@ [Unit] Description=The anaconda loader -Requires=dbus.service udev.service rsyslog.service tmp.mount instperf.service -After=dbus.service udev.service rsyslog.service tmp.mount instperf.service +Wants=instperf.service tmp.mount +After=instperf.service tmp.mount [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 _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list
