From 7de4dbea08f43bcbcfa0f6103356ed444af1a2c3 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 10 Jul 2024 11:58:22 +0200 Subject: [PATCH] Adapt Tramp's "run0" method * doc/misc/tramp.texi (Inline methods): * etc/NEWS: Adapt "run0" entry. * lisp/net/tramp-sh.el (tramp-enable-run0-method): Adapt "run0" arguments. --- doc/misc/tramp.texi | 6 +++--- etc/NEWS | 4 ++-- lisp/net/tramp-sh.el | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index ef74f1e3f13..e1130917f0c 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -892,9 +892,9 @@ a predefined timeout. @cindex method @option{run0} @cindex @option{run0} method -This method is used on @code{systemd}-based hosts. Internally, it -uses the @code{systemd-run} command. A @option{run0} connection is -disabled after a predefined timeout as well. +@c This requires systemd 256. Check with 'systemd-run --version'. +This method is used on @code{systemd}-based hosts. A @option{run0} +connection is disabled after a predefined timeout as well. This is an optional method, @pxref{Optional methods}. diff --git a/etc/NEWS b/etc/NEWS index 31d69ddabab..57b17cc858e 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1329,8 +1329,8 @@ Android. +++ *** New optional connection method "run0". -This connection method is similar to "sudo", but it uses the -'systemd-run' program internally. +This connection method is similar to "sudo", but it uses the 'systemd' +framework internally. +++ *** New connection methods "dockercp" and "podmancp". diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 4a0c09ff722..df8ca151718 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -509,8 +509,9 @@ The string is used in `tramp-methods'.") "Enable \"run0\" method." (add-to-list 'tramp-methods `("run0" - (tramp-login-program "systemd-run") - (tramp-login-args (("--uid" "%u") ("-t") ("%l"))) + (tramp-login-program "run0") + (tramp-login-args (("--user" "%u") + ("--background" "''") ("%l"))) (tramp-remote-shell ,tramp-default-remote-shell) (tramp-remote-shell-args ("-c")) (tramp-connection-timeout 10)