units: enable mount units by default and hook binary units into base.target instead...

diff --git a/Makefile.am b/Makefile.am
index 342b2b241ba0377ee9d4133977cdcabd939ee29e..6b306073a839b65ae5860e39fe3d756f2cd899d0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -941,7 +941,7 @@ install-data-hook:
                $(DESTDIR)$(systemunitdir) \
                $(DESTDIR)$(sessionunitdir) \
                $(DESTDIR)$(systemunitdir)/sockets.target.wants \
-               $(DESTDIR)$(systemunitdir)/sysinit.target.wants \
+               $(DESTDIR)$(systemunitdir)/basic.target.wants \
                $(DESTDIR)$(systemunitdir)/shutdown.target.wants \
                $(DESTDIR)$(systemunitdir)/local-fs.target.wants \
                $(DESTDIR)$(systemunitdir)/runlevel1.target.wants \
@@ -987,10 +987,17 @@ install-data-hook:
                $(LN_S) ../hwclock-save.service hwclock-save.service && \
                $(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
        ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
-               rm -f systemd-update-utmp-shutdown.service \
+               rm -f systemd-remount-api-vfs.service \
+                       remount-rootfs.service \
+                       var-run.mount \
                        var-run.service \
+                       var-lock.mount \
                        var-lock.service && \
+               $(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
+               $(LN_S) ../remount-rootfs.service remount-rootfs.service && \
+               $(LN_S) ../var-run.mount var-run.mount && \
                $(LN_S) ../var-run.service var-run.service && \
+               $(LN_S) ../var-lock.mount var-lock.mount && \
                $(LN_S) ../var-lock.service var-lock.service )
        ( cd $(DESTDIR)$(sessionunitdir) && \
                rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
@@ -1027,7 +1034,7 @@ install-data-hook:
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
                rm -f remote-fs.target && \
                $(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
-       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+       ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
                rm -f dev-hugepages.automount \
                        dev-mqueue.automount \
                        proc-sys-fs-binfmt_misc.automount \
@@ -1135,3 +1142,11 @@ upload: all distcheck
 
 git-tag:
        git tag "v$(VERSION)" -m "systemd $(VERSION)"
+
+# Opt out from a few services on Fedora for now, as long as rc.sysinit does this job
+fedora: install
+       rm /lib/systemd/system/local-fs.target.wants/var-run.service
+       rm /lib/systemd/system/local-fs.target.wants/var-run.mount
+       rm /lib/systemd/system/local-fs.target.wants/var-lock.service
+       rm /lib/systemd/system/local-fs.target.wants/var-lock.mount
+       rm /lib/systemd/system/local-fs.target.wants/remount-rootfs.service

diff --git a/units/hwclock-load.service b/units/hwclock-load.service
index 85d56db5d2fa5059866f05b6e5d8f2fd2083968c..5285615e178af7d5e4f28bc9c80caa27d2eefbeb 100644 (file)
--- a/units/hwclock-load.service
+++ b/units/hwclock-load.service
@@ -28,4 +28,4 @@ ExecStart=/sbin/hwclock --systz
 # system time as part of kernel setup.
 
 [Install]
-WantedBy=sysinit.target
+WantedBy=basic.target

diff --git a/units/remount-rootfs.service b/units/remount-rootfs.service
index 35a6ea08ccc11dd18d76d9f5669b21fdccc66503..089e8b5a2f4adf25f0a94e52aac1bf6ef194b36d 100644 (file)
--- a/units/remount-rootfs.service
+++ b/units/remount-rootfs.service
@@ -15,6 +15,3 @@ Before=shutdown.target local-fs.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/bin/mount / -o remount
-
-[Install]
-WantedBy=sysinit.target

diff --git a/units/systemd-kmsg-syslogd.socket b/units/systemd-kmsg-syslogd.socket
index 7487cd5def3b0bce8a9dbf407a1d647ccbe384c3..ace06fa563fa332a04634a90412e0c9112fab36b 100644 (file)
--- a/units/systemd-kmsg-syslogd.socket
+++ b/units/systemd-kmsg-syslogd.socket
@@ -17,4 +17,4 @@ ListenDatagram=/dev/log
 SocketMode=0666
 
 [Install]
-WantedBy=sysinit.target
+WantedBy=basic.target

diff --git a/units/systemd-random-seed-load.service.in b/units/systemd-random-seed-load.service.in
index 087f7b6800df33528c5d8e2b8d79bbc4e8dd400e..93cba95a6b942320db266c9b29612f20d9bbaad7 100644 (file)
--- a/units/systemd-random-seed-load.service.in
+++ b/units/systemd-random-seed-load.service.in
@@ -8,6 +8,7 @@
 [Unit]
 Description=Load Random Seed
 DefaultDependencies=no
+Wants=local-fs.target
 After=local-fs.target
 Conflicts=shutdown.target
 Before=shutdown.target

diff --git a/units/systemd-remount-api-vfs.service.in b/units/systemd-remount-api-vfs.service.in
index 2e19dbf05dbf8f83ded41ec78de6adc2942e2891..8ecf64f0e67b031a5ccde2fa20f8fd0499679a55 100644 (file)
--- a/units/systemd-remount-api-vfs.service.in
+++ b/units/systemd-remount-api-vfs.service.in
@@ -15,6 +15,3 @@ Before=shutdown.target local-fs.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=@rootlibexecdir@/systemd-remount-api-vfs
-
-[Install]
-WantedBy=sysinit.target