diff --git a/backport-docs-remove-dev-tty-confusion.patch b/backport-docs-remove-dev-tty-confusion.patch new file mode 100644 index 0000000..8b9a30e --- /dev/null +++ b/backport-docs-remove-dev-tty-confusion.patch @@ -0,0 +1,42 @@ +From 1e1a2538219e9db49062ba104b459a8ced33694a Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Fri, 23 Dec 2022 18:39:54 +0100 +Subject: [PATCH] docs: remove /dev/tty* confusion + +The text said /dev/tty* as a whole was the VT subsystem and that VT is +not supported in containers. + +But that's not accurate as /dev/tty* will match /dev/tty too and that +one device node is special and is not related to VT: it always points to +the current process own controlling tty, regardless what that is. + +hence, rewrite /dev/tty* as /dev/tty[0-9]*. + +Reference: https://github.com/systemd/systemd/pull/25851/commits/7b3a5e26911c675970f045406161f412cee0ab84 + +Signed-off-by: zhaoxiaohu +Signed-off-by: yuwang +--- + docs/CONTAINER_INTERFACE.md | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/docs/CONTAINER_INTERFACE.md b/docs/CONTAINER_INTERFACE.md +index ff458bd..41632b8 100644 +--- a/docs/CONTAINER_INTERFACE.md ++++ b/docs/CONTAINER_INTERFACE.md +@@ -292,9 +292,9 @@ care should be taken to avoid naming conflicts. `systemd` (and in particular + you cannot link them to each other. + + 4. Do not pretend that the real VTs are available in the container. The VT +- subsystem consists of all the devices `/dev/tty*`, `/dev/vcs*`, `/dev/vcsa*` +- plus their `sysfs` counterparts. They speak specific `ioctl()`s and +- understand specific escape sequences, that other ptys don't understand. ++ subsystem consists of all the devices `/dev/tty[0-9]*`, `/dev/vcs*`, ++ `/dev/vcsa*` plus their `sysfs` counterparts. They speak specific `ioctl()`s ++ and understand specific escape sequences, that other ptys don't understand. + Hence, it is explicitly not OK to mount a pty to `/dev/tty1`, `/dev/tty2`, + `/dev/tty3`. This is explicitly not supported. + +-- +2.33.0 + diff --git a/systemd.spec b/systemd.spec index bfe78af..1081971 100644 --- a/systemd.spec +++ b/systemd.spec @@ -25,7 +25,7 @@ Name: systemd Url: https://systemd.io/ Version: 249 -Release: 90 +Release: 91 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -687,6 +687,13 @@ Patch6634: backport-man-fix-directory-for-user-home-bind-mounts.patch Patch6635: backport-nspawn-fix-directory-in-logged-error.patch Patch6636: backport-test-boot-timestamp-Handle-ERANGE-error.patch Patch6637: backport-core-when-isolating-to-a-unit-also-keep-units-runnin.patch +Patch6638: backport-userdb-Use-json_dispatch_user_group_name-to-parse-Ge.patch +Patch6639: backport-README-explicitly-note-that-util-linux-s-mount-swap-.patch +Patch6640: backport-man-fix-section-number.patch +Patch6641: backport-repart-fix-invalid-errno-in-log.patch +Patch6642: backport-sysusers-insist-that-root-group-is-0.patch +Patch6643: backport-importd-Always-specify-file-unpacked-by-tar.patch +Patch6644: backport-docs-remove-dev-tty-confusion.patch Patch9001: update-rtc-with-system-clock-when-shutdown.patch Patch9002: udev-add-actions-while-rename-netif-failed.patch @@ -2201,6 +2208,15 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && /usr/bin/systemd-cryptenroll %changelog +* Wed Dec 04 2024 zhangyao - 249-91 +- add backport-userdb-Use-json_dispatch_user_group_name-to-parse-Ge.patch + backport-README-explicitly-note-that-util-linux-s-mount-swap-.patch + backport-man-fix-section-number.patch + backport-repart-fix-invalid-errno-in-log.patch + backport-sysusers-insist-that-root-group-is-0.patch + backport-importd-Always-specify-file-unpacked-by-tar.patch + backport-docs-remove-dev-tty-confusion.patch + * Wed Dec 04 2024 zhangyao - 249-90 - add backport-core-when-isolating-to-a-unit-also-keep-units-runnin.patch