units: make sure we run all early boot units before entering basic.target

16 files changed, 16 insertions, 11 deletions

diff --git a/units/dev-hugepages.automount b/units/dev-hugepages.automount
index ab8fa7c750..b9dae85481 100644
--- a/units/dev-hugepages.automount
+++ b/units/dev-hugepages.automount
@@ -8,6 +8,7 @@
 [Unit]
 Description=Huge Pages File System Automount Point
 DefaultDependencies=no
+Before=basic.target
 
 [Automount]
 Where=/dev/hugepages
diff --git a/units/dev-mqueue.automount b/units/dev-mqueue.automount
index ba45b28447..acdb5427d3 100644
--- a/units/dev-mqueue.automount
+++ b/units/dev-mqueue.automount
@@ -8,6 +8,7 @@
 [Unit]
 Description=POSIX Message Queue File System Automount Point
 DefaultDependencies=no
+Before=basic.target
 
 [Automount]
 Where=/dev/mqueue
diff --git a/units/hwclock-load.service b/units/hwclock-load.service
index 5285615e17..d3427e6eeb 100644
--- a/units/hwclock-load.service
+++ b/units/hwclock-load.service
@@ -9,7 +9,7 @@
 Description=Apply System Clock UTC Offset
 DefaultDependencies=no
 Conflicts=shutdown.target
-Before=shutdown.target udev.service
+Before=basic.target shutdown.target udev.service
 
 [Service]
 Type=oneshot
diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
index 29ae05b64a..f9b5cc71db 100644
--- a/units/proc-sys-fs-binfmt_misc.automount
+++ b/units/proc-sys-fs-binfmt_misc.automount
@@ -8,6 +8,7 @@
 [Unit]
 Description=Arbitrary Executable File Formats File System Automount Point
 DefaultDependencies=no
+Before=basic.target
 
 [Automount]
 Where=/proc/sys/fs/binfmt_misc
diff --git a/units/remount-rootfs.service b/units/remount-rootfs.service
index 4ff3645e69..31deb82db3 100644
--- a/units/remount-rootfs.service
+++ b/units/remount-rootfs.service
@@ -10,7 +10,7 @@ Description=Remount Root FS
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service fsck.target
-Before=shutdown.target local-fs.target
+Before=local-fs.target shutdown.target
 
 [Service]
 Type=oneshot
diff --git a/units/sys-kernel-debug.automount b/units/sys-kernel-debug.automount
index 3a6306f2eb..7b3e041b87 100644
--- a/units/sys-kernel-debug.automount
+++ b/units/sys-kernel-debug.automount
@@ -8,6 +8,7 @@
 [Unit]
 Description=Debug File System Automount Point
 DefaultDependencies=no
+Before=basic.target
 
 [Automount]
 Where=/sys/kernel/debug
diff --git a/units/sys-kernel-security.automount b/units/sys-kernel-security.automount
index a428e0b6c1..c43deb7d02 100644
--- a/units/sys-kernel-security.automount
+++ b/units/sys-kernel-security.automount
@@ -8,6 +8,7 @@
 [Unit]
 Description=Security File System Automount Point
 DefaultDependencies=no
+Before=basic.target
 
 [Automount]
 Where=/sys/kernel/security
diff --git a/units/sysctl.service b/units/sysctl.service
index 72dbb1f56a..3980e24211 100644
--- a/units/sysctl.service
+++ b/units/sysctl.service
@@ -10,7 +10,7 @@ Description=Apply Kernel Variables
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service
-Before=shutdown.target
+Before=basic.target shutdown.target
 
 [Service]
 Type=oneshot
diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in
index 1eb49011f5..59482953fc 100644
--- a/units/systemd-modules-load.service.in
+++ b/units/systemd-modules-load.service.in
@@ -10,7 +10,7 @@ Description=Load Kernel Modules
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service
-Before=shutdown.target
+Before=basic.target shutdown.target
 
 [Service]
 Type=oneshot
diff --git a/units/systemd-random-seed-load.service.in b/units/systemd-random-seed-load.service.in
index b103f52007..8e54db9220 100644
--- a/units/systemd-random-seed-load.service.in
+++ b/units/systemd-random-seed-load.service.in
@@ -11,7 +11,7 @@ DefaultDependencies=no
 Wants=local-fs.target
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target
-Before=shutdown.target
+Before=basic.target shutdown.target
 
 [Service]
 Type=oneshot
diff --git a/units/systemd-readahead-collect.service.in b/units/systemd-readahead-collect.service.in
index 6987cd493c..bcea65efae 100644
--- a/units/systemd-readahead-collect.service.in
+++ b/units/systemd-readahead-collect.service.in
@@ -10,7 +10,7 @@ Description=Collect Read-Ahead Data
 DefaultDependencies=no
 Wants=systemd-readahead-done.timer
 Conflicts=shutdown.target
-Before=shutdown.target
+Before=basic.target shutdown.target
 
 [Service]
 Type=notify
diff --git a/units/systemd-readahead-replay.service.in b/units/systemd-readahead-replay.service.in
index 280e7204c9..026d3b0efb 100644
--- a/units/systemd-readahead-replay.service.in
+++ b/units/systemd-readahead-replay.service.in
@@ -9,7 +9,7 @@
 Description=Replay Read-Ahead Data
 DefaultDependencies=no
 Conflicts=shutdown.target
-Before=shutdown.target
+Before=basic.target shutdown.target
 
 [Service]
 Type=notify
diff --git a/units/systemd-remount-api-vfs.service.in b/units/systemd-remount-api-vfs.service.in
index 87c8ccbf04..8d437f55c4 100644
--- a/units/systemd-remount-api-vfs.service.in
+++ b/units/systemd-remount-api-vfs.service.in
@@ -10,7 +10,7 @@ Description=Remount API VFS
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service
-Before=shutdown.target local-fs.target
+Before=local-fs.target shutdown.target
 
 [Service]
 Type=oneshot
diff --git a/units/systemd-tmpfiles.service.in b/units/systemd-tmpfiles.service.in
index f869195180..855573e2b4 100644
--- a/units/systemd-tmpfiles.service.in
+++ b/units/systemd-tmpfiles.service.in
@@ -10,7 +10,7 @@ Description=Recreate Volatile Files and Directories
 DefaultDependencies=no
 Wants=local-fs.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target
-Before=shutdown.target
+Before=basic.target shutdown.target
 
 [Service]
 Type=oneshot
diff --git a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in
index 52e31e0bc2..87985ce316 100644
--- a/units/systemd-vconsole-setup.service.in
+++ b/units/systemd-vconsole-setup.service.in
@@ -10,7 +10,7 @@ Description=Setup Virtual Console
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service
-Before=shutdown.target
+Before=basic.target shutdown.target
 
 [Service]
 Type=oneshot
diff --git a/units/tmpwatch.service b/units/tmpwatch.service
index 5cc0b6bb39..636faf9363 100644
--- a/units/tmpwatch.service
+++ b/units/tmpwatch.service
@@ -10,7 +10,7 @@ Description=Cleanup of Temporary Directories
 DefaultDependencies=no
 Wants=local-fs.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target
-Before=poweroff.service reboot.service halt.service killall.service
+Before=basic.target poweroff.service reboot.service halt.service killall.service
 
 [Service]
 Type=oneshot