[systemd-commits] 3 commits - NEWS TODO man/pam_systemd.xml src/console src/systemd

[Lennart Poettering]

 NEWS                           |    2 +-
 TODO                           |    2 --
 man/pam_systemd.xml            |    9 +++++++--
 src/console/consoled-manager.c |    2 +-
 src/systemd/sd-login.h         |    2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 2f952a25772a690eb03b6af2ad5998086a03234c
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Oct 28 12:33:25 2014 +0100

    update TODO

diff --git a/TODO b/TODO
index acac4e3..482377a 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,5 @@
 Fixes needed before 217:
 
-* sd_session_get_desktop() yells at me?
-
 * remove Discard= in .mount units and replace it by Options=, to prepare for later swapon fix
 
 * verify that both resolved and timesyncd work OK without networkd around

commit d1b6f12e07a304476ac29fc7306205f384db746f
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Oct 28 12:32:25 2014 +0100

    man: document that $XDG_SESSION_DESKTOP only takes a single item, not a list, unlike $XDG_CURRENT_DESKTOP

diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml
index cc80205..3e106ea 100644
--- a/man/pam_systemd.xml
+++ b/man/pam_systemd.xml
@@ -273,8 +273,13 @@
                                 <varname>$XDG_CURRENT_DESKTOP</varname>,
                                 as defined by the <ulink
                                 url="http://standards.freedesktop.org/desktop-entry-spec/latest/">Desktop
-                                Entry
-                                Specification</ulink>. See
+                                Entry Specification</ulink>. (However,
+                                note that
+                                <varname>$XDG_SESSION_DESKTOP</varname>
+                                only takes a single item, and not a
+                                colon-separated list like
+                                <varname>$XDG_CURRENT_DESKTOP</varname>.)
+                                See
                                 <citerefentry><refentrytitle>sd_session_get_desktop</refentrytitle><manvolnum>3</manvolnum></citerefentry>
                                 for more details.</para></listitem>
                         </varlistentry>

commit 090771492f155cebe7075171530e96c1cd515d71
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Oct 28 12:31:11 2014 +0100

    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.

diff --git a/NEWS b/NEWS
index 6c973fc..f618fec 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 8f3823f..1b856f2 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 93af197..64b8827 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. */