[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master d66e8f7: * lisp/net/tramp-sh.el (tramp-methods) <do
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master d66e8f7: * lisp/net/tramp-sh.el (tramp-methods) <doas>: Add. (Bug#22542) |
Date: |
Fri, 05 Feb 2016 17:04:04 +0000 |
branch: master
commit d66e8f72483ef8c6d7aa1afd391075235b4f23d2
Author: Xi Lu <address@hidden>
Commit: Michael Albinus <address@hidden>
* 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'.
---
lisp/net/tramp-sh.el | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 8d01a4b..5771269 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -308,6 +308,13 @@ The string is used in `tramp-methods'.")
(tramp-connection-timeout 10)))
;;;###tramp-autoload
(add-to-list 'tramp-methods
+ '("doas"
+ (tramp-login-program "doas")
+ (tramp-login-args (("-u" "%u") ("-s")))
+ (tramp-remote-shell "/bin/sh")
+ (tramp-connection-timeout 10)))
+;;;###tramp-autoload
+(add-to-list 'tramp-methods
'("ksu"
(tramp-login-program "ksu")
(tramp-login-args (("%u") ("-q")))
@@ -408,7 +415,7 @@ The string is used in `tramp-methods'.")
;;;###tramp-autoload
(add-to-list 'tramp-default-user-alist
- `(,(concat "\\`" (regexp-opt '("su" "sudo" "ksu")) "\\'")
+ `(,(concat "\\`" (regexp-opt '("su" "sudo" "ksu" "doas")) "\\'")
nil "root"))
;; Do not add "ssh" based methods, otherwise ~/.ssh/config would be ignored.
;; Do not add "plink" based methods, they ask interactively for the user.
@@ -483,6 +490,7 @@ The string is used in `tramp-methods'.")
(tramp-set-completion-function "nc"
tramp-completion-function-alist-telnet)
(tramp-set-completion-function "su" tramp-completion-function-alist-su)
(tramp-set-completion-function "sudo" tramp-completion-function-alist-su)
+ (tramp-set-completion-function "doas" tramp-completion-function-alist-su)
(tramp-set-completion-function "ksu" tramp-completion-function-alist-su)
(tramp-set-completion-function "sg" tramp-completion-function-alist-sg)
(tramp-set-completion-function
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master d66e8f7: * lisp/net/tramp-sh.el (tramp-methods) <doas>: Add. (Bug#22542),
Michael Albinus <=