units/*getty*: use /usr/sbin/agetty

Same way that we do it for quotaon and debug-shell by
going through meson

diff --git a/meson.build b/meson.build
index fc3748c1340242e0c7ce3e6f5c884d447d5b6a1a..86dbc45918d0192e41284a9fb023ee2dcfcfa6c5 100644 (file)
--- 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 abcdc279a25dac413370c528e47a1e1ae2468388..cd4b556283d66f28d92749d86cd68e1e705a04e1 100644 (file)
--- 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 f5b1911edc51196cc054e49646164da6202a98ca..49ce59d5b9aead378f145618b9db1e3e4d2e127b 100755 (executable)
--- 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 967d8337abd9df39257c2371b2d26356bcf1f0ed..278048724f713e4abb507e86682d2917fbda1475 100644 (file)
--- 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 e0b27613df0cb8be18c086989ad1d63a54cc3a5a..18e5a98a7ff4f507860e5adf3eb526d2276c12a9 100644 (file)
--- 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 104c4acc963ea7c1f582a44062b786cfe2b8e19c..15f1a572fd04760a824a5f77097860e927a06a31 100644 (file)
--- 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 0134c83d48f3f1ab891ecad171e76d62d98f1560..8b5a63d681f4310000422675411ef8bc4e9803eb 100644 (file)
--- 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