diff options
| author | Michael Biebl <biebl@debian.org> | 2015-06-03 14:00:59 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-06-03 14:14:42 +0200 |
| commit | 9391a1c3d6c94c478b0016a81df3f874fd99260e (patch) | |
| tree | 3ad2ecd003af709737a1eded2fee7c60162dce36 | |
| parent | 36f5e964dedc01b685a30367b7db1fa4c71ff2f3 (diff) | |
systemctl: Use /usr/bin/editor if available
If the EDITOR environment variable is not set, the Debian policy
recommends to use the /usr/bin/editor program as default editor.
This file is managed via the dpkg alternatives mechanism and typically
used in Debian/Ubuntu and derivatives to configure the default editor.
See section 11.4 of the Debian policy [1].
Therefor prefer /usr/bin/editor over specific editors if available.
[1] https://www.debian.org/doc/debian-policy/ch-customized-programs.html
| -rw-r--r-- | man/systemctl.xml | 1 | ||||
| -rw-r--r-- | src/systemctl/systemctl.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/man/systemctl.xml b/man/systemctl.xml index 35f47de52c..409b6f0895 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -1733,6 +1733,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service <varname>$VISUAL</varname> are present or if it is set to an empty string or if their execution failed, systemctl will try to execute well known editors in this order: + <citerefentry project='die-net'><refentrytitle>editor</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry project='die-net'><refentrytitle>nano</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry project='die-net'><refentrytitle>vim</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry project='die-net'><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></citerefentry>. diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index a7b8e54a9c..b3d90d2c33 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -5879,7 +5879,7 @@ static int run_editor(char **paths) { execvp(editor, (char* const*) args); } - FOREACH_STRING(p, "nano", "vim", "vi") { + FOREACH_STRING(p, "editor", "nano", "vim", "vi") { args[0] = p; execvp(p, (char* const*) args); /* We do not fail if the editor doesn't exist |