SHA256
1
0
forked from pool/systemd
systemd/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch
Dominique Leuenberger 98421d8347 Accepting request 964674 from Base:System
- spec: cope with %{_modprobedir} being /lib/modprobe.d on SLE

- Add 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch
  A temporary workaround until bsc#1197178 is resolved.

- Import commit 8ef8dfd5401ba18caec59e54a05af9f2e0d7ac65 (merge of v250.4)
  For a complete list of changes, visit:
  ca89b1d1fd...8ef8dfd540

- Import commit ca89b1d1fd1ae86cc1e763d2d01ec2806f3a4d3a
  37b683c832 journal: preserve acls when rotating user journals with NOCOW attribute set
  d043fabebc journal: when copying journal file to undo NOCOW flag, go via fd
  78c2766689 journal-file: explicitly handle file systems that do not support hole punching
  7ecfb4b098 journal-file: fix error handling of pread() in journald_file_punch_holes()
  c4946a412c journal-file: don't use pread() when determining where to append, use mmap as before
  d3fbd20628 journal: various fixes to journal_file_read_object()
  5897a8e8d4 shared: Handle filesystems that don't support hole punching in COPY_HOLES
  27746408e2 journal: Truncate file instead of punching hole in final object
  59b6130030 shared: Ensure COPY_HOLES copies trailing holes
  ac9ccba73f journal: stat journal file after truncating
  0257283444 journal: Copy holes when archiving BTRFS journal files
  26c2a9952d shared: Copy holes in sparse files in copy_bytes_full()
  6c7191dece copy: fix wrong argument passed to S_ISREG() in copy_file_fd_full()
  af0a43024d udev: 60-persistent-storage-tape.rules: handle duplicate device ID (bsc#1195529)

- Update Supplements to new format in baselibs.conf
- Fix libsystemd-shared exclusion in baselibs.conf
- Exclude new cryptsetup libraries in baselibs.conf

- systemd.spec: minor simplification by assuming that %{bootstrap} is always

OBS-URL: https://build.opensuse.org/request/show/964674
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=354
2022-03-28 14:58:41 +00:00

91 lines
3.3 KiB
Diff

From 8f2cc8089304b769c25f871f28503fa1af7a468f Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Thu, 17 Mar 2022 11:35:33 +0100
Subject: [PATCH 1/1] Revert "getty: Pass tty to use by agetty via stdin"
This reverts commit b4bf9007cbee7dc0b1356897344ae2a7890df84c.
---
units/console-getty.service.in | 4 +---
units/container-getty@.service.in | 4 +---
units/getty@.service.in | 4 +---
units/serial-getty@.service.in | 4 +---
4 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/units/console-getty.service.in b/units/console-getty.service.in
index 73871d6f50..bb67541dce 100644
--- a/units/console-getty.service.in
+++ b/units/console-getty.service.in
@@ -23,12 +23,10 @@ ConditionPathExists=/dev/console
# The '-o' option value tells agetty to replace 'login' arguments with an
# option to preserve environment (-p), followed by '--' for safety, and then
# the entered username.
-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud - 115200,38400,9600 $TERM
+ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud console 115200,38400,9600 $TERM
Type=idle
Restart=always
UtmpIdentifier=cons
-StandardInput=tty
-StandardOutput=tty
TTYPath=/dev/console
TTYReset=yes
TTYVHangup=yes
diff --git a/units/container-getty@.service.in b/units/container-getty@.service.in
index a6e3f94e2a..ed1eb7bde1 100644
--- a/units/container-getty@.service.in
+++ b/units/container-getty@.service.in
@@ -28,13 +28,11 @@ Before=rescue.service
# The '-o' option value tells agetty to replace 'login' arguments with an
# option to preserve environment (-p), followed by '--' for safety, and then
# the entered username.
-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud - 115200,38400,9600 $TERM
+ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud pts/%I 115200,38400,9600 $TERM
Type=idle
Restart=always
RestartSec=0
UtmpIdentifier=pts/%I
-StandardInput=tty
-StandardOutput=tty
TTYPath=/dev/pts/%I
TTYReset=yes
TTYVHangup=yes
diff --git a/units/getty@.service.in b/units/getty@.service.in
index 21d66f9367..78deb7cffe 100644
--- a/units/getty@.service.in
+++ b/units/getty@.service.in
@@ -38,13 +38,11 @@ ConditionPathExists=/dev/tty0
# The '-o' option value tells agetty to replace 'login' arguments with an
# option to preserve environment (-p), followed by '--' for safety, and then
# the entered username.
-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear - $TERM
+ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear %I $TERM
Type=idle
Restart=always
RestartSec=0
UtmpIdentifier=%I
-StandardInput=tty
-StandardOutput=tty
TTYPath=/dev/%I
TTYReset=yes
TTYVHangup=yes
diff --git a/units/serial-getty@.service.in b/units/serial-getty@.service.in
index 2433124c55..bb7af3105d 100644
--- a/units/serial-getty@.service.in
+++ b/units/serial-getty@.service.in
@@ -33,12 +33,10 @@ Before=rescue.service
# The '-o' option value tells agetty to replace 'login' arguments with an
# option to preserve environment (-p), followed by '--' for safety, and then
# the entered username.
-ExecStart=-/sbin/agetty -o '-p -- \\u' --keep-baud 115200,57600,38400,9600 - $TERM
+ExecStart=-/sbin/agetty -o '-p -- \\u' --keep-baud 115200,57600,38400,9600 %I $TERM
Type=idle
Restart=always
UtmpIdentifier=%I
-StandardInput=tty
-StandardOutput=tty
TTYPath=/dev/%I
TTYReset=yes
TTYVHangup=yes
--
2.34.1