summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-10-28 12:31:11 +0100
committerLennart Poettering <lennart@poettering.net>2014-10-28 12:31:11 +0100
commit090771492f155cebe7075171530e96c1cd515d71 (patch)
tree8e24d6c7bc6b982d1a9af42c7de5eddcd8e0f389
parentebc5788e88eb9e1ebd032bd61507c196142acbab (diff)
sd-login: let's not needlessly yell at users
While GNOME/KDE are generally capitalized, systemd tools generally are not, hence let's not start doing so in the XDG_CURRENT_SESSION environment variable.
-rw-r--r--NEWS2
-rw-r--r--src/console/consoled-manager.c2
-rw-r--r--src/systemd/sd-login.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 6c973fc81..f618fecef 100644
--- a/NEWS
+++ b/NEWS
@@ -51,7 +51,7 @@ CHANGES WITH 217:
* A user console daemon systemd-consoled has been
added. Currently, it is a preview, and will so far open a
single terminal on each session of the user marked as
- Desktop=SYSTEMD-CONSOLE.
+ Desktop=systemd-console.
* Route metrics can be specified for DHCP routes added by
systemd-networkd.
diff --git a/src/console/consoled-manager.c b/src/console/consoled-manager.c
index 8f3823fe4..1b856f222 100644
--- a/src/console/consoled-manager.c
+++ b/src/console/consoled-manager.c
@@ -132,7 +132,7 @@ static int manager_sysview_session_filter(Manager *m, sysview_event *event) {
if (r < 0)
return 0;
- return streq(desktop, "SYSTEMD-CONSOLE");
+ return streq(desktop, "systemd-console");
}
static int manager_sysview_session_add(Manager *m, sysview_event *event) {
diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h
index 93af19709..64b882724 100644
--- a/src/systemd/sd-login.h
+++ b/src/systemd/sd-login.h
@@ -147,7 +147,7 @@ int sd_session_get_type(const char *session, char **type);
/* Determine the class of this session, i.e. one of "user", "greeter" or "lock-screen". */
int sd_session_get_class(const char *session, char **clazz);
-/* Determine the desktop brand of this session, i.e. something like "GNOME", "KDE" or "SYSTEMD-CONSOLE". */
+/* Determine the desktop brand of this session, i.e. something like "GNOME", "KDE" or "systemd-console". */
int sd_session_get_desktop(const char *session, char **desktop);
/* Determine the X11 display of this session. */