aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXi Lu2016-02-05 18:03:57 +0100
committerMichael Albinus2016-02-05 18:03:57 +0100
commitd66e8f72483ef8c6d7aa1afd391075235b4f23d2 (patch)
tree185ec79a328cce3fb2b26a1e65bb87d7b1a24ead
parent44b15ee2e3ad47f97ecdcc68a35ece7943abf289 (diff)
downloademacs-d66e8f72483ef8c6d7aa1afd391075235b4f23d2.tar.gz
emacs-d66e8f72483ef8c6d7aa1afd391075235b4f23d2.zip
* lisp/net/tramp-sh.el (tramp-methods) <doas>: Add. (Bug#22542)
(tramp-default-user-alist): Add rule for "doas". (top): Completion function for "doas" is `tramp-completion-function-alist-su'.
-rw-r--r--lisp/net/tramp-sh.el10
1 files changed, 9 insertions, 1 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 8d01a4b2120..5771269417e 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -308,6 +308,13 @@ The string is used in `tramp-methods'.")
308 (tramp-connection-timeout 10))) 308 (tramp-connection-timeout 10)))
309;;;###tramp-autoload 309;;;###tramp-autoload
310(add-to-list 'tramp-methods 310(add-to-list 'tramp-methods
311 '("doas"
312 (tramp-login-program "doas")
313 (tramp-login-args (("-u" "%u") ("-s")))
314 (tramp-remote-shell "/bin/sh")
315 (tramp-connection-timeout 10)))
316;;;###tramp-autoload
317(add-to-list 'tramp-methods
311 '("ksu" 318 '("ksu"
312 (tramp-login-program "ksu") 319 (tramp-login-program "ksu")
313 (tramp-login-args (("%u") ("-q"))) 320 (tramp-login-args (("%u") ("-q")))
@@ -408,7 +415,7 @@ The string is used in `tramp-methods'.")
408 415
409;;;###tramp-autoload 416;;;###tramp-autoload
410(add-to-list 'tramp-default-user-alist 417(add-to-list 'tramp-default-user-alist
411 `(,(concat "\\`" (regexp-opt '("su" "sudo" "ksu")) "\\'") 418 `(,(concat "\\`" (regexp-opt '("su" "sudo" "ksu" "doas")) "\\'")
412 nil "root")) 419 nil "root"))
413;; Do not add "ssh" based methods, otherwise ~/.ssh/config would be ignored. 420;; Do not add "ssh" based methods, otherwise ~/.ssh/config would be ignored.
414;; Do not add "plink" based methods, they ask interactively for the user. 421;; Do not add "plink" based methods, they ask interactively for the user.
@@ -483,6 +490,7 @@ The string is used in `tramp-methods'.")
483 (tramp-set-completion-function "nc" tramp-completion-function-alist-telnet) 490 (tramp-set-completion-function "nc" tramp-completion-function-alist-telnet)
484 (tramp-set-completion-function "su" tramp-completion-function-alist-su) 491 (tramp-set-completion-function "su" tramp-completion-function-alist-su)
485 (tramp-set-completion-function "sudo" tramp-completion-function-alist-su) 492 (tramp-set-completion-function "sudo" tramp-completion-function-alist-su)
493 (tramp-set-completion-function "doas" tramp-completion-function-alist-su)
486 (tramp-set-completion-function "ksu" tramp-completion-function-alist-su) 494 (tramp-set-completion-function "ksu" tramp-completion-function-alist-su)
487 (tramp-set-completion-function "sg" tramp-completion-function-alist-sg) 495 (tramp-set-completion-function "sg" tramp-completion-function-alist-sg)
488 (tramp-set-completion-function 496 (tramp-set-completion-function