From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 10 Jul 2024 09:58:22 +0000 (+0200)
Subject: Adapt Tramp's "run0" method
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a9f037e05cb2744a2373202632fa7f5f440a2c3a;p=emacs.git

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.

(cherry picked from commit 7de4dbea08f43bcbcfa0f6103356ed444af1a2c3)
---

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 2361683fa14..d7b9e7b1758 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/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 3205c77210f..2c2bce75c4e 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)