Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: add inplace var mount #2986

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

WIP: add inplace var mount #2986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/boot/ostree-prepare-root.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ ConditionPathExists=/etc/initrd-release
OnFailure=emergency.target
After=sysroot.mount
Requires=sysroot.mount
Before=systemd-volatile-root.service
Before=initrd-root-fs.target

[Service]
Expand Down
35 changes: 35 additions & 0 deletions src/switchroot/ostree-prepare-root.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,29 @@ load_composefs_config (GKeyFile *config, GError **error)
return g_steal_pointer (&ret);
}

static gboolean
copy_selinux_context (const char *src_path, const char *dst_path, GError **error)
{
ssize_t bytes_read, real_size;

if (TEMP_FAILURE_RETRY (bytes_read = lgetxattr (src_path, "security.selinux", NULL, 0)) < 0)
{
if (errno == ENODATA || errno == ENOTSUP)
return TRUE; /* no selinux context, we're done */
return glnx_throw_errno_prefix (error, "lgetxattr(security.selinux)");
}

g_autofree guint8 *buf = g_malloc (bytes_read);
if (TEMP_FAILURE_RETRY (real_size = lgetxattr (src_path, "security.selinux", buf, bytes_read))
< 0)
return glnx_throw_errno_prefix (error, "lgetxattr(security.selinux)");

if (lsetxattr (dst_path, "security.selinux", buf, real_size, 0) < 0)
return glnx_throw_errno_prefix (error, "lsetxattr(security.selinux)");

return TRUE;
}

int
main (int argc, char *argv[])
{
Expand Down Expand Up @@ -639,6 +662,18 @@ main (int argc, char *argv[])
err (EXIT_FAILURE, "failed to prepare /var bind-mount at %s", srcpath);
if (mount ("../../var", "../../var", NULL, MS_BIND | MS_REMOUNT | MS_SILENT, NULL) < 0)
err (EXIT_FAILURE, "failed to make writable /var bind-mount at %s", srcpath);

if (mkdirat (AT_FDCWD, "/inplace", 0731) < 0)
err (EXIT_FAILURE, "Failed to create %s", "/inplace");
if (mkdirat (AT_FDCWD, "/inplace/var", 0731) < 0)
err (EXIT_FAILURE, "Failed to create %s", "/inplace/var");

g_autoptr (GError) local_error = NULL;
if (!copy_selinux_context ("../../var", "/inplace/var", &local_error))
err (EXIT_FAILURE, "failed to copy /var selinux label: %s", local_error->message);

if (mount ("../../var", "/inplace/var", NULL, MS_BIND | MS_SILENT, NULL) < 0)
err (EXIT_FAILURE, "failed to bind mount ../../var to /inplace/var");
}

/* When running under systemd, /var will be handled by a 'var.mount' unit outside
Expand Down