Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 261339
Collapse All | Expand All

(-)gdm-2.26.1.orig/common/gdm-settings-keys.h (+1 lines)
Lines 27-32 Link Here
27
27
28
#define GDM_KEY_USER "daemon/User"
28
#define GDM_KEY_USER "daemon/User"
29
#define GDM_KEY_GROUP "daemon/Group"
29
#define GDM_KEY_GROUP "daemon/Group"
30
#define GDM_KEY_VT "daemon/VT"
30
#define GDM_KEY_AUTO_LOGIN_ENABLE "daemon/AutomaticLoginEnable"
31
#define GDM_KEY_AUTO_LOGIN_ENABLE "daemon/AutomaticLoginEnable"
31
#define GDM_KEY_AUTO_LOGIN_USER "daemon/AutomaticLogin"
32
#define GDM_KEY_AUTO_LOGIN_USER "daemon/AutomaticLogin"
32
#define GDM_KEY_TIMED_LOGIN_ENABLE "daemon/TimedLoginEnable"
33
#define GDM_KEY_TIMED_LOGIN_ENABLE "daemon/TimedLoginEnable"
(-)gdm-2.26.1.orig/daemon/gdm-server.c (-3 / +12 lines)
Lines 43-49 Link Here
43
43
44
#include "gdm-common.h"
44
#include "gdm-common.h"
45
#include "gdm-signal-handler.h"
45
#include "gdm-signal-handler.h"
46
46
#include "gdm-settings.h"
47
#include "gdm-settings-direct.h"
48
#include "gdm-settings-keys.h"
47
#include "gdm-server.h"
49
#include "gdm-server.h"
48
50
49
extern char **environ;
51
extern char **environ;
Lines 79-85 Link Here
79
        char    *parent_display_name;
81
        char    *parent_display_name;
80
        char    *parent_auth_file;
82
        char    *parent_auth_file;
81
        char    *chosen_hostname;
83
        char    *chosen_hostname;
82
84
        char    *vt;
83
        guint    child_watch_id;
85
        guint    child_watch_id;
84
};
86
};
85
87
Lines 676-682 Link Here
676
        gboolean res;
678
        gboolean res;
677
679
678
        /* fork X server process */
680
        /* fork X server process */
679
        res = gdm_server_spawn (server, NULL);
681
        res = gdm_server_spawn (server, server->priv->vt);
680
682
681
        return res;
683
        return res;
682
}
684
}
Lines 927-932 Link Here
927
static void
929
static void
928
gdm_server_init (GdmServer *server)
930
gdm_server_init (GdmServer *server)
929
{
931
{
932
        int vt;
933
        gboolean has_vt;
930
934
931
        server->priv = GDM_SERVER_GET_PRIVATE (server);
935
        server->priv = GDM_SERVER_GET_PRIVATE (server);
932
936
Lines 934-939 Link Here
934
        server->priv->command = g_strdup (X_SERVER " -br -verbose");
938
        server->priv->command = g_strdup (X_SERVER " -br -verbose");
935
        server->priv->log_dir = g_strdup (LOGDIR);
939
        server->priv->log_dir = g_strdup (LOGDIR);
936
940
941
        has_vt =  gdm_settings_direct_get_int (GDM_KEY_VT, &vt);
942
        if (has_vt) {
943
                server->priv->vt = g_strdup_printf ("vt %d", vt);
944
        }
945
937
        add_ready_handler (server);
946
        add_ready_handler (server);
938
}
947
}
939
948
(-)gdm-2.26.1.orig/data/gdm.schemas.in.in (+5 lines)
Lines 23-28 Link Here
23
      <default>@GDM_GROUPNAME@</default>
23
      <default>@GDM_GROUPNAME@</default>
24
    </schema>
24
    </schema>
25
    <schema>
25
    <schema>
26
      <key>daemon/VT</key>
27
      <signature>i</signature>
28
      <default>7</default>
29
    </schema>
30
    <schema>
26
      <key>daemon/AutomaticLoginEnable</key>
31
      <key>daemon/AutomaticLoginEnable</key>
27
      <signature>b</signature>
32
      <signature>b</signature>
28
      <default>false</default>
33
      <default>false</default>

Return to bug 261339