From f3c15784a118757b2511cb73d8c5c84a14ab4bc2 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 7 Oct 2010 03:47:39 +0200
Subject: [PATCH] units: make sure we run all early boot units before entering
 basic.target

---
 units/dev-hugepages.automount              | 1 +
 units/dev-mqueue.automount                 | 1 +
 units/hwclock-load.service                 | 2 +-
 units/proc-sys-fs-binfmt_misc.automount    | 1 +
 units/remount-rootfs.service               | 2 +-
 units/sys-kernel-debug.automount           | 1 +
 units/sys-kernel-security.automount        | 1 +
 units/sysctl.service                       | 2 +-
 units/systemd-modules-load.service.in      | 2 +-
 units/systemd-random-seed-load.service.in  | 2 +-
 units/systemd-readahead-collect.service.in | 2 +-
 units/systemd-readahead-replay.service.in  | 2 +-
 units/systemd-remount-api-vfs.service.in   | 2 +-
 units/systemd-tmpfiles.service.in          | 2 +-
 units/systemd-vconsole-setup.service.in    | 2 +-
 units/tmpwatch.service                     | 2 +-
 16 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/units/dev-hugepages.automount b/units/dev-hugepages.automount
index ab8fa7c75..b9dae8548 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 ba45b2844..acdb5427d 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 5285615e1..d3427e6ee 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 29ae05b64..f9b5cc71d 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 4ff3645e6..31deb82db 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 3a6306f2e..7b3e041b8 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 a428e0b6c..c43deb7d0 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 72dbb1f56..3980e2421 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 1eb49011f..59482953f 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 b103f5200..8e54db922 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 6987cd493..bcea65efa 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 280e7204c..026d3b0ef 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 87c8ccbf0..8d437f55c 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 f86919518..855573e2b 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 52e31e0bc..87985ce31 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 5cc0b6bb3..636faf936 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
-- 
2.30.2