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

diff --git a/units/dev-hugepages.automount b/units/dev-hugepages.automount
index ab8fa7c750b9d3efaab4fa6f1d4150f488cb0624..b9dae85481ce04d3d1cd75c3060dcac6b82a6f91 100644 (file)
--- a/units/dev-hugepages.automount
+++ b/units/dev-hugepages.automount
@@ -8,6 +8,7 @@
 [Unit]
 Description=Huge Pages File System Automount Point
 DefaultDependencies=no
 [Unit]
 Description=Huge Pages File System Automount Point
 DefaultDependencies=no

+Before=basic.target

 
 [Automount]
 Where=/dev/hugepages
 
 [Automount]
 Where=/dev/hugepages

diff --git a/units/dev-mqueue.automount b/units/dev-mqueue.automount
index ba45b284471933082e2543105a8127ba78d18353..acdb5427d3c745df89df970f013e6015c5b99c70 100644 (file)
--- 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
 [Unit]
 Description=POSIX Message Queue File System Automount Point
 DefaultDependencies=no

+Before=basic.target

 
 [Automount]
 Where=/dev/mqueue
 
 [Automount]
 Where=/dev/mqueue

diff --git a/units/hwclock-load.service b/units/hwclock-load.service
index 5285615e178af7d5e4f28bc9c80caa27d2eefbeb..d3427e6eebb6f31c9c2f79d0c0ed97af44a3ec39 100644 (file)
--- 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
 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
 
 [Service]
 Type=oneshot

diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
index 29ae05b64aa46aefb5f1004d286721405a767df8..f9b5cc71db5ab47f1f6368ae04e423c7b9cca0b7 100644 (file)
--- 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
 [Unit]
 Description=Arbitrary Executable File Formats File System Automount Point
 DefaultDependencies=no

+Before=basic.target

 
 [Automount]
 Where=/proc/sys/fs/binfmt_misc
 
 [Automount]
 Where=/proc/sys/fs/binfmt_misc

diff --git a/units/remount-rootfs.service b/units/remount-rootfs.service
index 4ff3645e69df530aef9f3d3512283aa2b8f0f4cd..31deb82db3d89afbb8ca8b99c96809ada02fe44b 100644 (file)
--- 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
 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
 
 [Service]
 Type=oneshot

diff --git a/units/sys-kernel-debug.automount b/units/sys-kernel-debug.automount
index 3a6306f2eb8547d974a0737283b9a78fae940eaa..7b3e041b871dda6fac10a378481a7ad68e9c61aa 100644 (file)
--- 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
 [Unit]
 Description=Debug File System Automount Point
 DefaultDependencies=no

+Before=basic.target

 
 [Automount]
 Where=/sys/kernel/debug
 
 [Automount]
 Where=/sys/kernel/debug

diff --git a/units/sys-kernel-security.automount b/units/sys-kernel-security.automount
index a428e0b6c14eaabbe9df79af10123c48f503f7fb..c43deb7d02d2a3b12d9908e3c68db7c946e2709b 100644 (file)
--- 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
 [Unit]
 Description=Security File System Automount Point
 DefaultDependencies=no

+Before=basic.target

 
 [Automount]
 Where=/sys/kernel/security
 
 [Automount]
 Where=/sys/kernel/security

diff --git a/units/sysctl.service b/units/sysctl.service
index 72dbb1f56a3897e8a3df9b6367caed1719b60176..3980e242117fe9a15c4bdc3d55cc0d39c54c7d04 100644 (file)
--- 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
 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
 
 [Service]
 Type=oneshot

diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in
index 1eb49011f50b835bb9636230f095f53a5bfdd7b4..59482953fc91a3ba9f1e7e31652b1502eba5c58d 100644 (file)
--- 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
 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
 
 [Service]
 Type=oneshot

diff --git a/units/systemd-random-seed-load.service.in b/units/systemd-random-seed-load.service.in
index b103f52007f97cd454771e26dd358e8f0c5208eb..8e54db9220359ca49b0653dff4bdab01ecba0e60 100644 (file)
--- 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
 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
 
 [Service]
 Type=oneshot

diff --git a/units/systemd-readahead-collect.service.in b/units/systemd-readahead-collect.service.in
index 6987cd493c7c0c4420f8af318ff4d3c57025a838..bcea65efae2c784afa4cf345497af874469b775c 100644 (file)
--- 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
 DefaultDependencies=no
 Wants=systemd-readahead-done.timer
 Conflicts=shutdown.target

-Before=shutdown.target
+Before=basic.target shutdown.target

 
 [Service]
 Type=notify
 
 [Service]
 Type=notify

diff --git a/units/systemd-readahead-replay.service.in b/units/systemd-readahead-replay.service.in
index 280e7204c9e8ac6ac789201e89209d311a9c1f8f..026d3b0efb9fd08c4b3dc0c5067f4702b183e103 100644 (file)
--- 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
 Description=Replay Read-Ahead Data
 DefaultDependencies=no
 Conflicts=shutdown.target

-Before=shutdown.target
+Before=basic.target shutdown.target

 
 [Service]
 Type=notify
 
 [Service]
 Type=notify

diff --git a/units/systemd-remount-api-vfs.service.in b/units/systemd-remount-api-vfs.service.in
index 87c8ccbf04d937872d5bca73a584a69983f76464..8d437f55c40db2fb504f44901afd2aaf275aa626 100644 (file)
--- 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
 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
 
 [Service]
 Type=oneshot

diff --git a/units/systemd-tmpfiles.service.in b/units/systemd-tmpfiles.service.in
index f8691951808d3b3cbb541b28b3178aa746fabb74..855573e2b47915e878e28f7339c078483df4e91b 100644 (file)
--- 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
 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
 
 [Service]
 Type=oneshot

diff --git a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in
index 52e31e0bc25be9874d8e50bbdc6540b6f8918734..87985ce3161c88c350c7009139ffbacf9eccfc5e 100644 (file)
--- 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
 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
 
 [Service]
 Type=oneshot

diff --git a/units/tmpwatch.service b/units/tmpwatch.service
index 5cc0b6bb398d9a8770c0a2084d3e78b52aff9403..636faf9363f8a80a31266588f67d03a4a083a8f3 100644 (file)
--- 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
 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
 
 [Service]
 Type=oneshot