From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 2 Jun 2023 15:51:37 +0000 (+0200)
Subject: fstab-util: consider /run/nextroot/ among extrinsic mounts
X-Git-Tag: v254-rc1~298^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba1af88c3c5755eec5ba5a37077575893bd526a8;p=thirdparty%2Fsystemd.git

fstab-util: consider /run/nextroot/ among extrinsic mounts

This way we'll not add deps for the mount point that unmount it during
shutdown. This is similar as for /run/initramfs/ which we want to
transition into during shutdown.

This way we don't have to add "-o x-initrd.mount" to all bind mounts for
/run/nextroot anymore to make it survive the reboot, it will be implied.
---

diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index d22cff2d823..b0e274afcca 100644
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -47,6 +47,7 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) {
 
         if (PATH_STARTSWITH_SET(mount,
                                 "/run/initramfs",    /* This should stay around from before we boot until after we shutdown */
+                                "/run/nextroot",     /* Similar (though might be updated from the host) */
                                 "/proc",             /* All of this is API VFS */
                                 "/sys",              /* … dito … */
                                 "/dev"))             /* … dito … */