summaryrefslogtreecommitdiff
path: root/units/initrd.target
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2021-03-26 22:40:40 +0100
committerLennart Poettering <lennart@poettering.net>2021-04-20 18:26:17 +0200
commit29a24ab28e9790680348b1ffab653a321fa49a67 (patch)
tree6bf35850f80c21a86728106ed767e88a72bc4658 /units/initrd.target
parentee7561d014d073944779e155271d7042d7ea5572 (diff)
downloadsystemd-29a24ab28e9790680348b1ffab653a321fa49a67.tar.gz
fstab-generator: if usr= is specified, mount it to /sysusr/usr/ first
This changes the fstab-generator to handle mounting of /usr/ a bit differently than before. Instead of immediately mounting the fs to /sysroot/usr/ we'll first mount it to /sysusr/usr/ and then add a separate bind mount that mounts it from /sysusr/usr/ to /sysroot/usr/. This way we can access /usr independently of the root fs, without for waiting to be mounted via the /sysusr/ hierarchy. This is useful for invoking systemd-repart while a root fs doesn't exist yet and for creating it, with partition data read from the /usr/ hierarchy. This introduces a new generic target initrd-usr-fs.target that may be used to generically order services against /sysusr/ to become available.
Diffstat (limited to 'units/initrd.target')
-rw-r--r--units/initrd.target4
1 files changed, 2 insertions, 2 deletions
diff --git a/units/initrd.target b/units/initrd.target
index 655158a58b..fc8fbff4bd 100644
--- a/units/initrd.target
+++ b/units/initrd.target
@@ -14,6 +14,6 @@ OnFailure=emergency.target
OnFailureJobMode=replace-irreversibly
AssertPathExists=/etc/initrd-release
Requires=basic.target
-Wants=initrd-root-fs.target initrd-root-device.target initrd-fs.target initrd-parse-etc.service
-After=initrd-root-fs.target initrd-root-device.target initrd-fs.target basic.target rescue.service rescue.target
+Wants=initrd-root-fs.target initrd-root-device.target initrd-fs.target initrd-usr-fs.target initrd-parse-etc.service
+After=initrd-root-fs.target initrd-root-device.target initrd-fs.target initrd-usr-fs.target basic.target rescue.service rescue.target
AllowIsolate=yes