Prep v235: Apply pending upstream updates in src/core [2/4]

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 1bec092180e69f252434d14dcf14940be4ed7fe5..f53bbc6e581aa29bf69e5d68bb0b6c6a095fa77a 100644 (file)
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -951,7 +951,7 @@ static void cgroup_context_apply(Unit *u, CGroupMask mask, ManagerState state) {
 
                         acc[k++] = 0;
 
-                        if (startswith(a->path, "/dev/"))
+                        if (path_startswith(a->path, "/dev/"))
                                 whitelist_device(path, a->path, acc);
                         else if ((val = startswith(a->path, "block-")))
                                 whitelist_major(path, val, 'b', acc);

diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index cccec07ece2b9b52a8804da5f9f41d43efd7f397..a2c5ea1a9a3aaedea63ec87e2967f547da2be860 100644 (file)
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -121,8 +121,6 @@ static const MountPoint mount_table[] = {
         { "efivarfs",    "/sys/firmware/efi/efivars", "efivarfs",   NULL,                      MS_NOSUID|MS_NOEXEC|MS_NODEV,
           is_efi_boot,   MNT_NONE                   },
 #endif
-        { "xenfs",      "/proc/xen",                  "xenfs",     NULL,                      MS_NOSUID|MS_NOEXEC|MS_NODEV,
-          NULL,          MNT_NONE                   },
 #else
         { "cgroup",      "/sys/fs/cgroup/elogind",    "cgroup",     "none,name=elogind,release_agent="SYSTEMD_CGROUP_AGENT_PATH",xattr", MS_NOSUID|MS_NOEXEC|MS_NODEV,
           cg_is_legacy_wanted, MNT_IN_CONTAINER  },