From fa7e3a96e402547c11d0a61ee68faf022a399c56 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Sun, 24 Aug 2025 14:01:17 +0200 Subject: [PATCH] units/*getty*: use /usr/sbin/agetty Same way that we do it for quotaon and debug-shell by going through meson --- meson.build | 1 + meson_options.txt | 1 + test/units/TEST-35-LOGIN.sh | 2 +- units/console-getty.service.in | 2 +- units/container-getty@.service.in | 2 +- units/getty@.service.in | 2 +- units/serial-getty@.service.in | 2 +- 7 files changed, 7 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index fc3748c1340..86dbc45918d 100644 --- a/meson.build +++ b/meson.build @@ -636,6 +636,7 @@ progs = [['quotaon', '/usr/sbin/quotaon' ], ['sulogin', '/usr/sbin/sulogin' ], ['swapon', '/usr/sbin/swapon' ], ['swapoff', '/usr/sbin/swapoff' ], + ['agetty', '/usr/sbin/agetty' ], ['mount', '/usr/bin/mount', 'MOUNT_PATH'], ['umount', '/usr/bin/umount', 'UMOUNT_PATH'], ['loadkeys', '/usr/bin/loadkeys', 'KBD_LOADKEYS'], diff --git a/meson_options.txt b/meson_options.txt index abcdc279a25..cd4b556283d 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -59,6 +59,7 @@ option('kexec-path', type : 'string', description : 'path to kexec') option('sulogin-path', type : 'string', description : 'path to sulogin') option('swapon-path', type : 'string', description : 'path to swapon') option('swapoff-path', type : 'string', description : 'path to swapoff') +option('agetty-path', type : 'string', description : 'path to agetty') option('mount-path', type : 'string', description : 'path to mount') option('umount-path', type : 'string', description : 'path to umount') option('loadkeys-path', type : 'string', description : 'path to loadkeys') diff --git a/test/units/TEST-35-LOGIN.sh b/test/units/TEST-35-LOGIN.sh index f5b1911edc5..49ce59d5b9a 100755 --- a/test/units/TEST-35-LOGIN.sh +++ b/test/units/TEST-35-LOGIN.sh @@ -351,7 +351,7 @@ create_session() { [Service] Type=simple ExecStart= -ExecStart=-/sbin/agetty --autologin logind-test-user --noclear %I $TERM +ExecStart=-/usr/sbin/agetty --autologin logind-test-user --noclear %I $TERM Restart=no EOF systemctl daemon-reload diff --git a/units/console-getty.service.in b/units/console-getty.service.in index 967d8337abd..278048724f7 100644 --- a/units/console-getty.service.in +++ b/units/console-getty.service.in @@ -20,7 +20,7 @@ Before=getty.target ConditionPathExists=/dev/console [Service] -ExecStart=-/sbin/agetty --noreset --noclear --issue-file=/etc/issue:/etc/issue.d:/run/issue.d:/usr/lib/issue.d --keep-baud 115200,57600,38400,9600 - ${TERM} +ExecStart=-{{AGETTY}} --noreset --noclear --issue-file=/etc/issue:/etc/issue.d:/run/issue.d:/usr/lib/issue.d --keep-baud 115200,57600,38400,9600 - ${TERM} Type=idle Restart=always UtmpIdentifier=cons diff --git a/units/container-getty@.service.in b/units/container-getty@.service.in index e0b27613df0..18e5a98a7ff 100644 --- a/units/container-getty@.service.in +++ b/units/container-getty@.service.in @@ -25,7 +25,7 @@ Conflicts=rescue.service Before=rescue.service [Service] -ExecStart=-/sbin/agetty --noreset --noclear --issue-file=/etc/issue:/etc/issue.d:/run/issue.d:/usr/lib/issue.d - ${TERM} +ExecStart=-{{AGETTY}} --noreset --noclear --issue-file=/etc/issue:/etc/issue.d:/run/issue.d:/usr/lib/issue.d - ${TERM} Type=idle Restart=always RestartSec=0 diff --git a/units/getty@.service.in b/units/getty@.service.in index 104c4acc963..15f1a572fd0 100644 --- a/units/getty@.service.in +++ b/units/getty@.service.in @@ -34,7 +34,7 @@ Before=rescue.service ConditionPathExists=/dev/tty0 [Service] -ExecStart=-/sbin/agetty --noreset --noclear --issue-file=/etc/issue:/etc/issue.d:/run/issue.d:/usr/lib/issue.d - ${TERM} +ExecStart=-{{AGETTY}} --noreset --noclear --issue-file=/etc/issue:/etc/issue.d:/run/issue.d:/usr/lib/issue.d - ${TERM} Type=idle Restart=always RestartSec=0 diff --git a/units/serial-getty@.service.in b/units/serial-getty@.service.in index 0134c83d48f..8b5a63d681f 100644 --- a/units/serial-getty@.service.in +++ b/units/serial-getty@.service.in @@ -30,7 +30,7 @@ Conflicts=rescue.service Before=rescue.service [Service] -ExecStart=-/sbin/agetty --noreset --noclear --issue-file=/etc/issue:/etc/issue.d:/run/issue.d:/usr/lib/issue.d --keep-baud 115200,57600,38400,9600 - ${TERM} +ExecStart=-{{AGETTY}} --noreset --noclear --issue-file=/etc/issue:/etc/issue.d:/run/issue.d:/usr/lib/issue.d --keep-baud 115200,57600,38400,9600 - ${TERM} Type=idle Restart=always UtmpIdentifier=%I -- 2.47.3