Hello community, here is the log from the commit of package gdm for openSUSE:Factory checked in at 2012-03-29 13:51:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdm (Old) and /work/SRC/openSUSE:Factory/.gdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gdm", Maintainer is "DLiang@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/gdm/gdm.changes 2012-02-21 12:18:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gdm.new/gdm.changes 2012-03-29 13:51:07.000000000 +0200 @@ -1,0 +2,61 @@ +Wed Mar 28 08:09:57 UTC 2012 - vuntz@opensuse.org + +- Update to version 3.4.0.1: + + Fix autologin +- Remove xz BuildRequires now that it comes for free in the build + system. +- Temporarily disable systemd support as it breaks on Factory + because of our old Xorg (bnc#753498): + + Add a with_systemd macro, set to 0. + + Only use --with-systemd configure option if with_systemd is set + to 1. + + Only use pkgconfig(libsystemd-daemon) and + pkgconfig(libsystemd-login) BuildRequires if with_systemd is + set to 1. + +------------------------------------------------------------------- +Tue Mar 27 07:18:45 UTC 2012 - vuntz@opensuse.org + +- Update to version 3.4.0: + + Updated translations. + +------------------------------------------------------------------- +Wed Mar 21 15:02:48 UTC 2012 - vuntz@opensuse.org + +- Also pass --with-console-kit to configure to make sure we also + build the ConsoleKit support. +- Move %glib2_gsettings_schema_requires from + gdm-simple-greeter-extensions to main subpackage, where the + GSettings schemas live. +- Update gdm-plymouth.patch with Fedora's version. +- Rebase and re-enable gdm-greeter-greater-ui.patch. +- Disable gnome-patch-translation-{prepare,update} calls in %prep + as they're only needed for gdm-domain-logon.patch, which needs to + be rebased. + +------------------------------------------------------------------- +Tue Mar 20 20:41:28 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.3.92.1: + + ConsoleKit fixes. +- Changes from version 3.3.92: + + Only start Xorg with high verbosity when debug is enabled. + + Land support for systemd and multi-seat. + + Switch from GConf to GSettings. + + Auth fixes. + + Miscellaneous fixes. + + Updated translations. +- Drop gdm-gconf-path.patch: not needed after port to GSettings. +- Rebase gdm-desktop-session-env-pam.patch and gdm-plymouth.patch. +- Temporarily disable gdm-greeter-greater-ui.patch: it needs to be + rebased. +- Drop gconf2-devel BuildRequires and gconf packaging: gdm got + ported to GSettings. +- Enable systemd support: + + Note that it nicely falls back to ConsoleKit if systemd is not + used on the system. + + Pass --with-systemd to configure + + Add pkgconfig(libsystemd-login) and + pkgconfig(libsystemd-daemon) BuildRequires. + +------------------------------------------------------------------- Old: ---- gdm-3.2.1.1.tar.xz gdm-gconf-path.patch New: ---- gdm-3.4.0.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdm.spec ++++++ --- /var/tmp/diff_new_pack.LdaDIM/_old 2012-03-29 13:51:11.000000000 +0200 +++ /var/tmp/diff_new_pack.LdaDIM/_new 2012-03-29 13:51:11.000000000 +0200 @@ -16,17 +16,20 @@ # +# We cannot enable systemd support right now, as it means starting X with +# --seat, which doesn't work until we get xorg 1.12 +%define with_systemd 0 # FIXME: need to check what should be done to enable this (at least adapt the pam files). See bnc#699999 %define enable_split_authentication 0 Name: gdm -Version: 3.2.1.1 +Version: 3.4.0.1 Release: 0 Summary: The GNOME Display Manager License: GPL-2.0+ Group: System/GUI/GNOME Url: http://projects.gnome.org/gdm/ -Source: http://download.gnome.org/sources/gdm/3.2/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gdm/3.4/%{name}-%{version}.tar.xz Source1: gdm.pamd Source2: gdm-autologin.pamd Source3: gdm-welcome.pamd @@ -57,8 +60,6 @@ Patch15: gdm-greeter-greater-ui.patch # PATCH-FIX-UPSTREAM gdm-always-reflect-keyboard-layout.patch bnc438159 bgo561771 hpj@novell.com -- Make keyboard selector not neglect to apply the selected keyboard in some situations. Patch18: gdm-always-reflect-keyboard-layout.patch -# PATCH-FIX-OPENSUSE gdm-gconf-path.patch vuntz@novell.com -- Fix gconf paths to be consistent with the ones used in openSUSE -Patch31: gdm-gconf-path.patch # PATCH-FIX-OPENSUSE gdm-default-wm.patch vuntz@novell.com -- Use sysconfig to know to which desktop to use by default Patch34: gdm-default-wm.patch # PATCH-FIX-OPENSUSE gdm-xauthlocalhostname.patch bgo555464 vuntz@novell.com -- Set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes @@ -71,7 +72,6 @@ BuildRequires: dbus-1-glib-devel # needed for directory ownership BuildRequires: dconf -BuildRequires: gconf2-devel BuildRequires: gnome-doc-utils-devel BuildRequires: gnome-patch-translation # needed for directory ownership @@ -85,9 +85,9 @@ BuildRequires: libattr-devel BuildRequires: libcanberra-devel BuildRequires: libselinux-devel +BuildRequires: libtool BuildRequires: libupower-glib-devel BuildRequires: libxklavier-devel -BuildRequires: libtool BuildRequires: pam-devel BuildRequires: pwdutils BuildRequires: tcpd-devel @@ -95,9 +95,11 @@ BuildRequires: update-desktop-files BuildRequires: xorg-x11-server BuildRequires: xorg-x11-server-extra -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz BuildRequires: pkgconfig(accountsservice) +%if %{with_systemd} +BuildRequires: pkgconfig(libsystemd-daemon) +BuildRequires: pkgconfig(libsystemd-login) +%endif BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xau) @@ -133,7 +135,7 @@ Obsoletes: gnome-applets-gdm < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build DocDir: %{_defaultdocdir} -%gconf_schemas_prereq +%glib2_gsettings_schema_requires %description The GNOME Display Manager is a system service that is responsible for @@ -174,7 +176,6 @@ Summary: GDM Simple Greeter Extensions -- Fingerprint and Smartcard Support Group: System/Libraries Supplements: gdm -%glib2_gsettings_schema_requires %description simple-greeter-extensions The GNOME Display Manager is a system service that is responsible for @@ -229,7 +230,7 @@ %setup -q translation-update-upstream #disabled, needed for patch10 -gnome-patch-translation-prepare +#gnome-patch-translation-prepare %patch0 -p1 %patch2 -p1 %patch3 -p1 @@ -239,15 +240,13 @@ %patch8 -p1 %patch9 -p1 #%%patch10 -p1 -# needs rebase (bnc#689552) %patch15 -p1 %patch18 -p1 -%patch31 -p1 %patch34 -p1 %patch35 -p0 %patch40 -p1 %patch60 -gnome-patch-translation-update +#gnome-patch-translation-update %build libtoolize -f -i @@ -261,6 +260,10 @@ --with-check-accelerated-directory=%{_libexecdir} \ --with-selinux \ --enable-ipv6 \ +%if %{with_systemd} + --with-systemd \ +%endif + --with-console-kit \ %if %{enable_split_authentication} --enable-split-authentication \ %else @@ -275,7 +278,6 @@ %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print -%find_gconf_schemas %if ! %{enable_split_authentication} # Create extensions directory if it's not there yet, so we can package it test ! -d %{buildroot}%{_libdir}/gdm/simple-greeter/extensions @@ -318,7 +320,7 @@ %clean rm -rf $RPM_BUILD_ROOT -%pre -f %{name}.schemas_pre +%pre /usr/sbin/groupadd -r gdm 2> /dev/null || : /usr/sbin/useradd -r -o -g gdm -G video -s /bin/false \ -c "Gnome Display Manager daemon" -d /var/lib/gdm gdm 2> /dev/null || : @@ -350,9 +352,7 @@ %glib2_gsettings_schema_post %icon_theme_cache_post -%preun -f %{name}.schemas_preun - -%posttrans -f %{name}.schemas_posttrans +%posttrans # Create dconf database for gdm, to lockdown the gdm session dconf update @@ -369,7 +369,7 @@ %postun -n libgdmsimplegreeter1 -p /sbin/ldconfig -%files -f %{name}.schemas_list +%files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README %dir %{_datadir}/gnome/ @@ -396,9 +396,6 @@ %attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm %ghost %attr(751,gdm,gdm) %dir %{_localstatedir}/run/gdm %attr(750,gdm,gdm) %dir %{_localstatedir}/log/gdm -%attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory -%attr(640,gdm,gdm) %{_localstatedir}/lib/gdm/.gconf.mandatory/%gconf-tree.xml -%attr(640,gdm,gdm) %{_localstatedir}/lib/gdm/.gconf.path %dir %{_localstatedir}/cache/gdm %config /etc/pam.d/gdm %config /etc/pam.d/gdm-autologin ++++++ gdm-desktop-session-env-pam.patch ++++++ --- /var/tmp/diff_new_pack.LdaDIM/_old 2012-03-29 13:51:11.000000000 +0200 +++ /var/tmp/diff_new_pack.LdaDIM/_new 2012-03-29 13:51:11.000000000 +0200 @@ -1,8 +1,8 @@ -Index: gdm-3.1.90/daemon/gdm-session-worker.c +Index: gdm-3.3.92.1/daemon/gdm-session-worker.c =================================================================== ---- gdm-3.1.90.orig/daemon/gdm-session-worker.c -+++ gdm-3.1.90/daemon/gdm-session-worker.c -@@ -139,6 +139,8 @@ struct GdmSessionWorkerPrivate +--- gdm-3.3.92.1.orig/daemon/gdm-session-worker.c ++++ gdm-3.3.92.1/daemon/gdm-session-worker.c +@@ -148,6 +148,8 @@ struct GdmSessionWorkerPrivate GdmSessionAuditor *auditor; GdmSessionSettings *user_settings; @@ -11,10 +11,10 @@ }; enum { -@@ -152,6 +154,11 @@ static void gdm_session_worker_final - +@@ -166,6 +168,11 @@ static void gdm_session_worker_set_e static void queue_state_change (GdmSessionWorker *worker); + +static void +gdm_session_worker_set_environment_variable (GdmSessionWorker *worker, + const char *key, @@ -23,7 +23,7 @@ typedef int (* GdmSessionWorkerPamNewMessagesFunc) (int, const struct pam_message **, struct pam_response **, -@@ -1166,6 +1173,9 @@ gdm_session_worker_initialize_pam (GdmSe +@@ -1196,6 +1203,9 @@ gdm_session_worker_initialize_pam (GdmSe } #endif @@ -33,7 +33,7 @@ g_debug ("GdmSessionWorker: state SETUP_COMPLETE"); worker->priv->state = GDM_SESSION_WORKER_STATE_SETUP_COMPLETE; -@@ -2011,11 +2021,26 @@ static void +@@ -2051,11 +2061,26 @@ static void gdm_session_worker_set_session_name (GdmSessionWorker *worker, const char *session_name) { @@ -60,7 +60,7 @@ on_set_session_name (GdmSessionWorker *worker, DBusMessage *message) { -@@ -2068,6 +2093,28 @@ on_set_session_type (GdmSessionWorker *w +@@ -2108,6 +2133,28 @@ on_set_session_type (GdmSessionWorker *w } static void @@ -89,7 +89,7 @@ gdm_session_worker_set_language_name (GdmSessionWorker *worker, const char *language_name) { -@@ -2774,6 +2821,8 @@ worker_dbus_handle_message (DBusConnecti +@@ -2830,6 +2877,8 @@ worker_dbus_handle_message (DBusConnecti on_set_session_name (worker, message); } else if (dbus_message_is_signal (message, GDM_SESSION_DBUS_INTERFACE, "SetSessionType")) { on_set_session_type (worker, message); @@ -98,7 +98,7 @@ } else { return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } -@@ -2944,6 +2993,8 @@ gdm_session_worker_finalize (GObject *ob +@@ -3001,6 +3050,8 @@ gdm_session_worker_finalize (GObject *ob g_free (worker->priv->server_address); g_strfreev (worker->priv->arguments); @@ -107,11 +107,11 @@ G_OBJECT_CLASS (gdm_session_worker_parent_class)->finalize (object); } -Index: gdm-3.1.90/daemon/gdm-session-direct.c +Index: gdm-3.3.92.1/daemon/gdm-session-direct.c =================================================================== ---- gdm-3.1.90.orig/daemon/gdm-session-direct.c -+++ gdm-3.1.90/daemon/gdm-session-direct.c -@@ -131,6 +131,8 @@ G_DEFINE_TYPE_WITH_CODE (GdmSessionDirec +--- gdm-3.3.92.1.orig/daemon/gdm-session-direct.c ++++ gdm-3.3.92.1/daemon/gdm-session-direct.c +@@ -135,6 +135,8 @@ G_DEFINE_TYPE_WITH_CODE (GdmSessionDirec G_IMPLEMENT_INTERFACE (GDM_TYPE_SESSION, gdm_session_iface_init)) @@ -120,7 +120,7 @@ static gboolean send_dbus_message (GdmSessionConversation *conversation, DBusMessage *message) -@@ -770,10 +772,27 @@ get_default_session_name (GdmSessionDire +@@ -774,10 +776,27 @@ get_default_session_name (GdmSessionDire static void gdm_session_direct_defaults_changed (GdmSessionDirect *session) { @@ -148,7 +148,7 @@ } static void -@@ -1226,11 +1245,28 @@ gdm_session_direct_handle_saved_session_ +@@ -1230,11 +1249,28 @@ gdm_session_direct_handle_saved_session_ if (strcmp (session_name, get_default_session_name (session)) != 0) { @@ -177,7 +177,7 @@ } out: return DBUS_HANDLER_RESULT_HANDLED; -@@ -1425,6 +1461,9 @@ do_introspect (DBusConnection *connectio +@@ -1434,6 +1470,9 @@ do_introspect (DBusConnection *connectio " <signal name=\"SetSessionType\">\n" " <arg name=\"session_type\" type=\"s\"/>\n" " </signal>\n" ++++++ gdm-greeter-greater-ui.patch ++++++ --- /var/tmp/diff_new_pack.LdaDIM/_old 2012-03-29 13:51:11.000000000 +0200 +++ /var/tmp/diff_new_pack.LdaDIM/_new 2012-03-29 13:51:11.000000000 +0200 @@ -426,7 +426,7 @@ - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> -- <property name="has_default">True</property> +- <property name="has_default">False</property> - <property name="receives_default">False</property> - </object> - <packing> @@ -501,7 +501,7 @@ + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> -+ <property name="has_default">True</property> ++ <property name="has_default">False</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + </object> @@ -745,7 +745,7 @@ + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> -+ <property name="has_default">True</property> ++ <property name="has_default">False</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + </object> ++++++ gdm-plymouth.patch ++++++ --- /var/tmp/diff_new_pack.LdaDIM/_old 2012-03-29 13:51:11.000000000 +0200 +++ /var/tmp/diff_new_pack.LdaDIM/_new 2012-03-29 13:51:11.000000000 +0200 @@ -1,4 +1,4 @@ -From b865a1ec2965d26dea2db9de085d4d09c3830434 Mon Sep 17 00:00:00 2001 +From e6ed6f48c35a6c736a5cde2dcfb6c10941e07809 Mon Sep 17 00:00:00 2001 From: Ray Strode <rstrode@redhat.com> Date: Fri, 27 Nov 2009 18:27:53 -0500 Subject: [PATCH 1/2] Save root window to pixmap at _XROOTPMAP_ID @@ -12,14 +12,13 @@ 3 files changed, 81 insertions(+), 0 deletions(-) diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c -index b9165fd..c091bdd 100644 +index 9d1347a..fc8649c 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c -@@ -1212,6 +1212,14 @@ setup_server (GdmSimpleSlave *slave) - +@@ -1215,6 +1215,14 @@ setup_server (GdmSimpleSlave *slave) + /* Set the initial keyboard layout to something reasonable */ gdm_slave_set_initial_keyboard_layout (GDM_SLAVE (slave)); -+ + /* The root window has a background that may be useful + * to cross fade or transition from when setting the + * login screen background. We read it here, and stuff @@ -27,11 +26,12 @@ + * so gnome-settings-daemon can get at it. + */ + gdm_slave_save_root_windows (GDM_SLAVE (slave)); ++ } static void diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c -index 787ef89..09df6de 100644 +index 371b9bd..694dcde 100644 --- a/daemon/gdm-slave.c +++ b/daemon/gdm-slave.c @@ -43,6 +43,7 @@ @@ -42,8 +42,8 @@ #include <X11/cursorfont.h> /* for watch cursor */ #include <X11/extensions/Xrandr.h> #include <X11/Xatom.h> -@@ -483,6 +484,77 @@ gdm_slave_set_initial_cursor_position (GdmSlave *slave) - } +@@ -364,6 +365,77 @@ gdm_slave_run_script (GdmSlave *slave, + return ret; } +static void @@ -118,7 +118,7 @@ +} + void - gdm_slave_set_busy_cursor (GdmSlave *slave) + gdm_slave_set_initial_keyboard_layout (GdmSlave *slave) { diff --git a/daemon/gdm-slave.h b/daemon/gdm-slave.h index 7af20ed..aaaa8f2 100644 @@ -133,10 +133,10 @@ const char *dir, const char *username); -- -1.7.6.2 +1.7.9 -From 70dae28439a2ce54441fa24b7dca4a2933f9a348 Mon Sep 17 00:00:00 2001 +From 03d92cf39f74b265cc9936bdeabfcf071b102767 Mon Sep 17 00:00:00 2001 From: Ray Strode <rstrode@redhat.com> Date: Fri, 27 Nov 2009 18:52:54 -0500 Subject: [PATCH 2/2] Enable smooth transition between plymouth and X @@ -144,160 +144,32 @@ This commit checks if plymouth is running, and if so, turns on the smooth transition between plymouth and X. --- - configure.ac | 17 +++++++ - daemon/Makefile.am | 1 + - daemon/gdm-display.c | 30 +++++++++++- - daemon/gdm-server.c | 56 +++++++++++++++++++++++ - daemon/gdm-server.h | 1 + - daemon/gdm-simple-slave.c | 102 ++++++++++++++++++++++++++++++++++++++++++- - daemon/gdm-simple-slave.h | 3 +- - daemon/gdm-slave.c | 23 ++++++++++ - daemon/gdm-static-display.c | 17 +++++++ - daemon/simple-slave-main.c | 4 +- - data/Makefile.am | 8 +++ - 11 files changed, 255 insertions(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 10f6d60..bae6186 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1311,6 +1311,23 @@ GDM_SIMPLE_GREETER_EXTENSIONS_DATA_DIR=${datadir}/gdm/simple-greeter/extensions - AC_SUBST(GDM_SIMPLE_GREETER_EXTENSIONS_DATA_DIR) - - dnl --------------------------------------------------------------------------- -+dnl - Directory to spool events from other processes -+dnl --------------------------------------------------------------------------- -+ -+AC_ARG_WITH(spool-dir, -+ AS_HELP_STRING([--with-spool-dir=<dir>], -+ [spool directory])) -+ -+if ! test -z "$with_spool_dir"; then -+ GDM_SPOOL_DIR=$with_spool_dir -+else -+ GDM_SPOOL_DIR=${localstatedir}/spool/gdm -+fi -+ -+AC_SUBST(GDM_SPOOL_DIR) -+ -+ -+dnl --------------------------------------------------------------------------- - dnl - Finish - dnl --------------------------------------------------------------------------- - -diff --git a/daemon/Makefile.am b/daemon/Makefile.am -index 65e82b8..9ec0f4a 100644 ---- a/daemon/Makefile.am -+++ b/daemon/Makefile.am -@@ -15,6 +15,7 @@ AM_CPPFLAGS = \ - -DLOGDIR=\"$(logdir)\" \ - -DSBINDIR=\"$(sbindir)\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -+ -DGDM_SPOOL_DIR=\"$(GDM_SPOOL_DIR)\" \ - -DGDM_XAUTH_DIR=\"$(GDM_XAUTH_DIR)\" \ - -DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\" \ - -DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \ -diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c -index 6ee675a..83ae445 100644 ---- a/daemon/gdm-display.c -+++ b/daemon/gdm-display.c -@@ -65,7 +65,9 @@ struct GdmDisplayPrivate - gsize x11_cookie_size; - GdmDisplayAccessFile *access_file; - -- gboolean is_local; -+ guint is_local : 1; -+ guint force_active_vt : 1; -+ - guint finish_idle_id; - - GdmSlaveProxy *slave_proxy; -@@ -84,6 +86,7 @@ enum { - PROP_X11_COOKIE, - PROP_X11_AUTHORITY_FILE, - PROP_IS_LOCAL, -+ PROP_FORCE_ACTIVE_VT, - PROP_SLAVE_COMMAND, - }; - -@@ -574,9 +577,10 @@ gdm_display_real_prepare (GdmDisplay *display) - gdm_slave_proxy_set_log_path (display->priv->slave_proxy, log_path); - g_free (log_path); - -- command = g_strdup_printf ("%s --display-id %s", -+ command = g_strdup_printf ("%s --display-id %s %s", - display->priv->slave_command, -- display->priv->id); -+ display->priv->id, -+ display->priv->force_active_vt? "--force-active-vt" : ""); - gdm_slave_proxy_set_command (display->priv->slave_proxy, command); - g_free (command); - -@@ -824,6 +828,13 @@ _gdm_display_set_is_local (GdmDisplay *display, - } - - static void -+_gdm_display_set_force_active_vt (GdmDisplay *display, -+ gboolean force_active_vt) -+{ -+ display->priv->force_active_vt = force_active_vt; -+} -+ -+static void - _gdm_display_set_slave_command (GdmDisplay *display, - const char *command) - { -@@ -866,6 +877,9 @@ gdm_display_set_property (GObject *object, - case PROP_IS_LOCAL: - _gdm_display_set_is_local (self, g_value_get_boolean (value)); - break; -+ case PROP_FORCE_ACTIVE_VT: -+ _gdm_display_set_force_active_vt (self, g_value_get_boolean (value)); -+ break; - case PROP_SLAVE_COMMAND: - _gdm_display_set_slave_command (self, g_value_get_string (value)); - break; -@@ -914,6 +928,9 @@ gdm_display_get_property (GObject *object, - case PROP_IS_LOCAL: - g_value_set_boolean (value, self->priv->is_local); - break; -+ case PROP_FORCE_ACTIVE_VT: -+ g_value_set_boolean (value, self->priv->force_active_vt); -+ break; - case PROP_SLAVE_COMMAND: - g_value_set_string (value, self->priv->slave_command); - break; -@@ -1084,6 +1101,13 @@ gdm_display_class_init (GdmDisplayClass *klass) - NULL, - TRUE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); -+ g_object_class_install_property (object_class, -+ PROP_FORCE_ACTIVE_VT, -+ g_param_spec_boolean ("force-active-vt", -+ NULL, -+ NULL, -+ FALSE, -+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + daemon/gdm-server.c | 55 +++++++++++++++++++++++++++ + daemon/gdm-server.h | 1 + + daemon/gdm-simple-slave.c | 91 ++++++++++++++++++++++++++++++++++++++++++++- + 3 files changed, 146 insertions(+), 1 deletions(-) - g_object_class_install_property (object_class, - PROP_SLAVE_COMMAND, diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c -index 62ffca1..8d270bb 100644 +index 54bf8b3..365590f 100644 --- a/daemon/gdm-server.c +++ b/daemon/gdm-server.c -@@ -32,8 +32,11 @@ +@@ -32,6 +32,7 @@ #include <pwd.h> #include <grp.h> #include <signal.h> +#include <sys/ioctl.h> #include <sys/resource.h> -+#include <linux/vt.h> -+ #ifdef HAVE_SYS_PRCTL_H - #include <sys/prctl.h> +@@ -41,6 +42,7 @@ + #ifdef WITH_SYSTEMD + #include <systemd/sd-daemon.h> #endif -@@ -673,6 +676,44 @@ gdm_server_spawn (GdmServer *server, ++#include <linux/vt.h> + + #include <glib.h> + #include <glib/gi18n.h> +@@ -732,6 +734,44 @@ gdm_server_spawn (GdmServer *server, return ret; } @@ -342,7 +214,7 @@ /** * gdm_server_start: * @disp: Pointer to a GdmDisplay structure -@@ -691,6 +732,21 @@ gdm_server_start (GdmServer *server) +@@ -750,6 +790,21 @@ gdm_server_start (GdmServer *server) return res; } @@ -353,7 +225,7 @@ + char *vt; + + g_free (server->priv->command); -+ server->priv->command = g_strdup (X_SERVER " -background none -verbose"); ++ server->priv->command = g_strdup (X_SERVER " -background none -logverbose 7"); + vt = get_active_vt_as_string (); + res = gdm_server_spawn (server, vt); + g_free (vt); @@ -365,11 +237,11 @@ server_died (GdmServer *server) { diff --git a/daemon/gdm-server.h b/daemon/gdm-server.h -index 535a69a..bd6c60a 100644 +index b53d68e..4939382 100644 --- a/daemon/gdm-server.h +++ b/daemon/gdm-server.h -@@ -56,6 +56,7 @@ GType gdm_server_get_type (void); - GdmServer * gdm_server_new (const char *display_id, +@@ -57,6 +57,7 @@ GdmServer * gdm_server_new (const char *display_id, + const char *seat_id, const char *auth_file); gboolean gdm_server_start (GdmServer *server); +gboolean gdm_server_start_on_active_vt (GdmServer *server); @@ -377,26 +249,18 @@ char * gdm_server_get_display_device (GdmServer *server); diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c -index c091bdd..f8dd56f 100644 +index fc8649c..dd19ced 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c -@@ -90,6 +90,7 @@ struct GdmSimpleSlavePrivate - - guint start_session_when_ready : 1; - guint waiting_to_start_session : 1; -+ guint plymouth_is_running : 1; +@@ -93,6 +93,7 @@ struct GdmSimpleSlavePrivate #ifdef HAVE_LOGINDEVPERM gboolean use_logindevperm; #endif -@@ -97,6 +98,7 @@ struct GdmSimpleSlavePrivate ++ guint plymouth_is_running : 1; + }; enum { - PROP_0, -+ FORCE_ACTIVE_VT - }; - - static void gdm_simple_slave_class_init (GdmSimpleSlaveClass *klass); -@@ -1201,6 +1203,72 @@ on_start_session_later (GdmGreeterServer *session, +@@ -1204,6 +1205,72 @@ on_start_session_later (GdmGreeterServer *session, slave->priv->start_session_when_ready = FALSE; } @@ -469,11 +333,10 @@ static void setup_server (GdmSimpleSlave *slave) { -@@ -1220,6 +1288,11 @@ setup_server (GdmSimpleSlave *slave) - * so gnome-settings-daemon can get at it. +@@ -1223,6 +1290,10 @@ setup_server (GdmSimpleSlave *slave) */ gdm_slave_save_root_windows (GDM_SLAVE (slave)); -+ + + /* Plymouth is waiting for the go-ahead to exit */ + if (slave->priv->plymouth_is_running) { + plymouth_quit_with_transition (slave); @@ -481,7 +344,7 @@ } static void -@@ -1423,6 +1496,10 @@ on_server_exited (GdmServer *server, +@@ -1426,6 +1497,10 @@ on_server_exited (GdmServer *server, g_debug ("GdmSimpleSlave: server exited with code %d\n", exit_code); gdm_slave_stopped (GDM_SLAVE (slave)); @@ -492,7 +355,7 @@ } static void -@@ -1435,6 +1512,10 @@ on_server_died (GdmServer *server, +@@ -1438,6 +1513,10 @@ on_server_died (GdmServer *server, g_strsignal (signal_number)); gdm_slave_stopped (GDM_SLAVE (slave)); @@ -503,21 +366,7 @@ } static gboolean -@@ -1443,11 +1524,13 @@ gdm_simple_slave_run (GdmSimpleSlave *slave) - char *display_name; - char *auth_file; - gboolean display_is_local; -+ gboolean force_active_vt; - - g_object_get (slave, - "display-is-local", &display_is_local, - "display-name", &display_name, - "display-x11-authority-file", &auth_file, -+ "force-active-vt", &force_active_vt, - NULL); - - /* if this is local display start a server if one doesn't -@@ -1479,7 +1562,17 @@ gdm_simple_slave_run (GdmSimpleSlave *slave) +@@ -1484,7 +1563,14 @@ gdm_simple_slave_run (GdmSimpleSlave *slave) G_CALLBACK (on_server_ready), slave); @@ -528,15 +377,12 @@ + plymouth_prepare_for_transition (slave); + res = gdm_server_start_on_active_vt (slave->priv->server); + } else { -+ if (force_active_vt) -+ res = gdm_server_start_on_active_vt (slave->priv->server); -+ else -+ res = gdm_server_start (slave->priv->server); ++ res = gdm_server_start (slave->priv->server); + } if (! res) { g_warning (_("Could not start the X " "server (your graphical environment) " -@@ -1489,6 +1582,9 @@ gdm_simple_slave_run (GdmSimpleSlave *slave) +@@ -1494,6 +1580,9 @@ gdm_simple_slave_run (GdmSimpleSlave *slave) "In the meantime this display will be " "disabled. Please restart GDM when " "the problem is corrected.")); @@ -546,196 +392,5 @@ exit (1); } -@@ -1645,12 +1741,14 @@ gdm_simple_slave_finalize (GObject *object) - } - - GdmSlave * --gdm_simple_slave_new (const char *id) -+gdm_simple_slave_new (const char *id, -+ gboolean force_active_vt) - { - GObject *object; - - object = g_object_new (GDM_TYPE_SIMPLE_SLAVE, - "display-id", id, -+ "force-active-vt", force_active_vt, - NULL); - - return GDM_SLAVE (object); -diff --git a/daemon/gdm-simple-slave.h b/daemon/gdm-simple-slave.h -index 1f1aa1d..e9aa624 100644 ---- a/daemon/gdm-simple-slave.h -+++ b/daemon/gdm-simple-slave.h -@@ -48,7 +48,8 @@ typedef struct - } GdmSimpleSlaveClass; - - GType gdm_simple_slave_get_type (void); --GdmSlave * gdm_simple_slave_new (const char *id); -+GdmSlave * gdm_simple_slave_new (const char *id, -+ gboolean force_active_vt); - - G_END_DECLS - -diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c -index 09df6de..ce467b2 100644 ---- a/daemon/gdm-slave.c -+++ b/daemon/gdm-slave.c -@@ -92,6 +92,7 @@ struct GdmSlavePrivate - char *display_hostname; - gboolean display_is_local; - gboolean display_is_parented; -+ gboolean force_active_vt; - char *display_seat_id; - char *display_x11_authority_file; - char *parent_display_name; -@@ -111,6 +112,7 @@ enum { - PROP_DISPLAY_NUMBER, - PROP_DISPLAY_HOSTNAME, - PROP_DISPLAY_IS_LOCAL, -+ PROP_FORCE_ACTIVE_VT, - PROP_DISPLAY_SEAT_ID, - PROP_DISPLAY_X11_AUTHORITY_FILE - }; -@@ -1651,6 +1653,13 @@ _gdm_slave_set_display_is_local (GdmSlave *slave, - } - - static void -+_gdm_slave_set_force_active_vt (GdmSlave *slave, -+ gboolean force_active_vt) -+{ -+ slave->priv->force_active_vt = force_active_vt; -+} -+ -+static void - gdm_slave_set_property (GObject *object, - guint prop_id, - const GValue *value, -@@ -1682,6 +1691,9 @@ gdm_slave_set_property (GObject *object, - case PROP_DISPLAY_IS_LOCAL: - _gdm_slave_set_display_is_local (self, g_value_get_boolean (value)); - break; -+ case PROP_FORCE_ACTIVE_VT: -+ _gdm_slave_set_force_active_vt (self, g_value_get_boolean (value)); -+ break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; -@@ -1720,6 +1732,9 @@ gdm_slave_get_property (GObject *object, - case PROP_DISPLAY_IS_LOCAL: - g_value_set_boolean (value, self->priv->display_is_local); - break; -+ case PROP_FORCE_ACTIVE_VT: -+ g_value_set_boolean (value, self->priv->force_active_vt); -+ break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; -@@ -1845,6 +1860,14 @@ gdm_slave_class_init (GdmSlaveClass *klass) - TRUE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - -+ g_object_class_install_property (object_class, -+ PROP_FORCE_ACTIVE_VT, -+ g_param_spec_boolean ("force-active-vt", -+ "Force Active VT", -+ "Force display to active VT", -+ TRUE, -+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); -+ - signals [STOPPED] = - g_signal_new ("stopped", - G_TYPE_FROM_CLASS (object_class), -diff --git a/daemon/gdm-static-display.c b/daemon/gdm-static-display.c -index 16953f9..397f07e 100644 ---- a/daemon/gdm-static-display.c -+++ b/daemon/gdm-static-display.c -@@ -81,10 +81,27 @@ gdm_static_display_remove_user_authorization (GdmDisplay *display, - } - - static gboolean -+triggered_to_force_display_on_active_vt (void) -+{ -+ gboolean should_force_display_on_active_vt; -+ -+ should_force_display_on_active_vt = g_file_test (GDM_SPOOL_DIR "/force-display-on-active-vt", -+ G_FILE_TEST_EXISTS); -+ g_unlink (GDM_SPOOL_DIR "/force-display-on-active-vt"); -+ -+ return should_force_display_on_active_vt; -+} -+ -+static gboolean - gdm_static_display_manage (GdmDisplay *display) - { - g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE); - -+ if (triggered_to_force_display_on_active_vt ()) { -+ g_object_set (display, "force-active-vt", TRUE, NULL); -+ } else { -+ g_object_set (display, "force-active-vt", FALSE, NULL); -+ } - GDM_DISPLAY_CLASS (gdm_static_display_parent_class)->manage (display); - - return TRUE; -diff --git a/daemon/simple-slave-main.c b/daemon/simple-slave-main.c -index 057492b..afa60a4 100644 ---- a/daemon/simple-slave-main.c -+++ b/daemon/simple-slave-main.c -@@ -177,9 +177,11 @@ main (int argc, - DBusGConnection *connection; - GdmSlave *slave; - static char *display_id = NULL; -+ static gboolean force_active_vt = FALSE; - GdmSignalHandler *signal_handler; - static GOptionEntry entries [] = { - { "display-id", 0, 0, G_OPTION_ARG_STRING, &display_id, N_("Display ID"), N_("ID") }, -+ { "force-active-vt", 0, 0, G_OPTION_ARG_NONE, &force_active_vt, N_("Force X to start on active vt"), NULL }, - { NULL } - }; - -@@ -246,7 +248,7 @@ main (int argc, - gdm_signal_handler_add (signal_handler, SIGUSR1, signal_cb, NULL); - gdm_signal_handler_add (signal_handler, SIGUSR2, signal_cb, NULL); - -- slave = gdm_simple_slave_new (display_id); -+ slave = gdm_simple_slave_new (display_id, force_active_vt); - if (slave == NULL) { - goto out; - } -diff --git a/data/Makefile.am b/data/Makefile.am -index 3175436..5c11b03 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -12,6 +12,7 @@ predir = $(gdmconfdir)/PreSession - postlogindir = $(gdmconfdir)/PostLogin - workingdir = $(GDM_WORKING_DIR) - xauthdir = $(GDM_XAUTH_DIR) -+spooldir = $(GDM_SPOOL_DIR) - screenshotdir = $(GDM_SCREENSHOT_DIR) - cachedir = $(localstatedir)/cache/gdm - -@@ -159,6 +160,7 @@ uninstall-hook: - $(DESTDIR)$(workingdir)/.config/dconf \ - $(DESTDIR)$(screenshotdir) \ -- $(DESTDIR)$(xauthdir) -+ $(DESTDIR)$(xauthdir) \ -+ $(DESTDIR)$(spooldir) - - -rmdir \ - $(DESTDIR)$(sysconfdir)/dconf/db/gdm.d/locks \ -@@ -303,6 +305,12 @@ install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.pa - chown root:gdm $(DESTDIR)$(cachedir) || : ; \ - fi - -+ if test '!' -d $(DESTDIR)$(spooldir); then \ -+ $(mkinstalldirs) $(DESTDIR)$(spooldir); \ -+ chmod 775 $(DESTDIR)$(spooldir); \ -+ chown root:gdm $(DESTDIR)$(spooldir) || : ; \ -+ fi -+ - $(INSTALL_DATA) $(srcdir)/gconf.path $(DESTDIR)$(workingdir)/.gconf.path - gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --recursive-unset / - gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --load $(srcdir)/session-setup.entries --- -1.7.6.2 - +-- +1.7.9 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org