summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-12 04:20:24 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-12 04:20:47 +0000
commit543e3a49e2ef9f73b6b4993a246616e061a7f48c (patch)
treeab373ad35f98295263d3ef5ea720256322d80841 /debian
parentMerging debian version 256-1. (diff)
downloadsystemd-543e3a49e2ef9f73b6b4993a246616e061a7f48c.tar.xz
systemd-543e3a49e2ef9f73b6b4993a246616e061a7f48c.zip
Refreshing proc-hidepid.patch.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/progress-linux/0002-proc-hidepid.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/patches/progress-linux/0002-proc-hidepid.patch b/debian/patches/progress-linux/0002-proc-hidepid.patch
index 52de2bd..d67a09d 100644
--- a/debian/patches/progress-linux/0002-proc-hidepid.patch
+++ b/debian/patches/progress-linux/0002-proc-hidepid.patch
@@ -4,10 +4,10 @@ Description: Mounting /proc with hidepid=2 option.
diff -Naurp systemd.orig/src/nspawn/nspawn-mount.c systemd/src/nspawn/nspawn-mount.c
--- systemd.orig/src/nspawn/nspawn-mount.c
+++ systemd/src/nspawn/nspawn-mount.c
-@@ -542,7 +542,7 @@ int mount_all(const char *dest,
+@@ -559,7 +559,7 @@ int mount_all(const char *dest,
static const MountPoint mount_table[] = {
- /* First we list inner child mounts (i.e. mounts applied *after* entering user namespacing) */
+ /* First we list inner child mounts (i.e. mounts applied *after* entering user namespacing when we are privileged) */
- { "proc", "/proc", "proc", NULL, PROC_DEFAULT_MOUNT_FLAGS,
+ { "proc", "/proc", "proc", "hidepid=2", PROC_DEFAULT_MOUNT_FLAGS,
MOUNT_FATAL|MOUNT_IN_USERNS|MOUNT_MKDIR|MOUNT_FOLLOW_SYMLINKS }, /* we follow symlinks here since not following them requires /proc/ already being mounted, which we don't have here. */