diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-10 20:52:57 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-10 20:52:57 +0000 |
| commit | 6113c32dfee92088970986190146fb424ffbb302 (patch) | |
| tree | 575cd1d7fe258bcafc6f0de59f9b7bb813bfc2fb | |
| parent | Reserving virtual terminal on position 2 in logind. (diff) | |
| download | systemd-6113c32dfee92088970986190146fb424ffbb302.tar.xz systemd-6113c32dfee92088970986190146fb424ffbb302.zip | |
Mounting /etc/hostname as /run/host/hostname in systemd-nspawn container.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | debian/patches/progress-linux/0005-nspawn-hostname.patch | 17 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/debian/patches/progress-linux/0005-nspawn-hostname.patch b/debian/patches/progress-linux/0005-nspawn-hostname.patch new file mode 100644 index 0000000..275ed17 --- /dev/null +++ b/debian/patches/progress-linux/0005-nspawn-hostname.patch @@ -0,0 +1,17 @@ +Author: Daniel Baumann <daniel.baumann@progress-linux.org> +Description: Mount /etc/hostname as /run/host/hostname in systemd-nspawn container. + +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 +@@ -553,6 +553,10 @@ int mount_all(const char *dest, + MOUNT_FATAL|MOUNT_MKDIR }, + { "/run/host", "/run/host", NULL, NULL, MS_BIND, + MOUNT_FATAL|MOUNT_MKDIR|MOUNT_PREFIX_ROOT }, /* Prepare this so that we can make it read-only when we are done */ ++ { "/etc/hostname", "/run/host/hostname", NULL, NULL, MS_BIND, ++ MOUNT_TOUCH }, /* As per kernel interface requirements, bind mount first (creating mount points) and make read-only later */ ++ { NULL, "/run/host/hostname", NULL, NULL, MS_BIND|MS_RDONLY|MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_REMOUNT, ++ MOUNT_FATAL }, + { "/etc/os-release", "/run/host/os-release", NULL, NULL, MS_BIND, + MOUNT_TOUCH }, /* As per kernel interface requirements, bind mount first (creating mount points) and make read-only later */ + { "/usr/lib/os-release", "/run/host/os-release", NULL, NULL, MS_BIND, diff --git a/debian/patches/series b/debian/patches/series index 893204e..8d381dd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,4 @@ progress-linux/0001-agetty-nohostname.patch progress-linux/0002-proc-hidepid.patch progress-linux/0003-logind-noautovts.patch progress-linux/0004-logind-reservevt.patch +progress-linux/0005-nspawn-hostname.patch |