SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: create workdir/upperdir when mounting a Type=overlay mount unit

Browse Source 
So far we created the target directory, and the source for bind mounts,
but not workdir/upperdir for overlays, so it has to be done separately
and strictly before the unit is started, which is annoying. Check the
options when creating directories, and if upper/work directories are
specified, create them.
This commit is contained in:
Luca Boccassi
2023-12-08 11:22:14 +09:00
committed by Yu Watanabe
parent fe6e0cfa19
commit 6c75eff6af
3 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/mount.c
+28
View File
@@ -1200,6 +1200,34 @@ static void mount_enter_mounting(Mount *m) {
if (r < 0 && r != -EEXIST)
log_unit_warning_errno(UNIT(m), r, "Failed to create mount point '%s', ignoring: %m", m->where);
/* If we are asked to create an OverlayFS, create the upper/work directories if they are missing */
if (streq_ptr(p->fstype, "overlay")) {
_cleanup_strv_free_ char **dirs = NULL;
r = fstab_filter_options(
p->options,
"upperdir\0workdir\0",
/* ret_namefound= */ NULL,
/* ret_value= */ NULL,
&dirs,
/* ret_filtered= */ NULL);
if (r < 0)
log_unit_warning_errno(
UNIT(m),
r,
"Failed to determine upper directory for OverlayFS, ignoring: %m");
else
STRV_FOREACH(d, dirs) {
r = mkdir_p_label(*d, m->directory_mode);
if (r < 0 && r != -EEXIST)
log_unit_warning_errno(
UNIT(m),
r,
"Failed to create overlay directory '%s', ignoring: %m",
*d);
}
}
if (source_is_dir)
unit_warn_if_dir_nonempty(UNIT(m), m->where);
unit_warn_leftover_processes(UNIT(m), unit_log_leftover_process_start);