summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2014-05-02 12:26:05 -0400
committerPeter Hutterer <peter.hutterer@who-t.net>2015-01-14 14:58:56 +1000
commit9d67e77d10a60cc11e2af410750ab321a9d0ca60 (patch)
treef75c39b972ae09e7072aca99731987a02ac09211
parent2d42a4df82b1e54fd07d1c6250bcdad338b5eae2 (diff)
logind: Point out we probed for VT when using logind
Right now if logind figures out the VT for us to use, we claim it was determined from the command line. This commit fixes logging to say we probed for the result.
-rw-r--r--hw/xfree86/os-support/linux/lnx_init.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
index 9ebd2b4a5..45d1f8eff 100644
--- a/hw/xfree86/os-support/linux/lnx_init.c
+++ b/hw/xfree86/os-support/linux/lnx_init.c
@@ -35,6 +35,7 @@
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_OSlib.h"
+#include "systemd-logind.h"
#include <sys/stat.h>
@@ -95,7 +96,10 @@ xf86OpenConsole(void)
* setup the virtual terminal manager
*/
if (xf86Info.vtno != -1) {
- from = X_CMDLINE;
+ if (!systemd_logind_controls_session())
+ from = X_CMDLINE;
+ else
+ from = X_PROBED;
}
else {