diff options
| author | Michael Albinus | 2016-02-05 18:57:35 +0100 |
|---|---|---|
| committer | Michael Albinus | 2016-02-05 18:57:35 +0100 |
| commit | 05570f0002a6bcecf2b72ea3f22d6653e00a45a6 (patch) | |
| tree | 65d046c0078de592c572fc980c599165cddcaf3a /lisp | |
| parent | d66e8f72483ef8c6d7aa1afd391075235b4f23d2 (diff) | |
| download | emacs-05570f0002a6bcecf2b72ea3f22d6653e00a45a6.tar.gz emacs-05570f0002a6bcecf2b72ea3f22d6653e00a45a6.zip | |
Minor cleanup for Tramp "doas".
* doc/misc/tramp.texi (Inline methods): Add "doas" method.
* etc/NEWS: Add Tramp connection method "doas".
* lisp/net/tramp-sh.el (tramp-methods) <doas>:
Add `tramp-remote-shell-args'.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/net/tramp-sh.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 5771269417e..c2ab67b6f4f 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -312,6 +312,7 @@ The string is used in `tramp-methods'.") | |||
| 312 | (tramp-login-program "doas") | 312 | (tramp-login-program "doas") |
| 313 | (tramp-login-args (("-u" "%u") ("-s"))) | 313 | (tramp-login-args (("-u" "%u") ("-s"))) |
| 314 | (tramp-remote-shell "/bin/sh") | 314 | (tramp-remote-shell "/bin/sh") |
| 315 | (tramp-remote-shell-args ("-c")) | ||
| 315 | (tramp-connection-timeout 10))) | 316 | (tramp-connection-timeout 10))) |
| 316 | ;;;###tramp-autoload | 317 | ;;;###tramp-autoload |
| 317 | (add-to-list 'tramp-methods | 318 | (add-to-list 'tramp-methods |
| @@ -415,7 +416,7 @@ The string is used in `tramp-methods'.") | |||
| 415 | 416 | ||
| 416 | ;;;###tramp-autoload | 417 | ;;;###tramp-autoload |
| 417 | (add-to-list 'tramp-default-user-alist | 418 | (add-to-list 'tramp-default-user-alist |
| 418 | `(,(concat "\\`" (regexp-opt '("su" "sudo" "ksu" "doas")) "\\'") | 419 | `(,(concat "\\`" (regexp-opt '("su" "sudo" "doas" "ksu")) "\\'") |
| 419 | nil "root")) | 420 | nil "root")) |
| 420 | ;; Do not add "ssh" based methods, otherwise ~/.ssh/config would be ignored. | 421 | ;; Do not add "ssh" based methods, otherwise ~/.ssh/config would be ignored. |
| 421 | ;; Do not add "plink" based methods, they ask interactively for the user. | 422 | ;; Do not add "plink" based methods, they ask interactively for the user. |