components/ConsoleKit/patches/11-sol-vtdaemon.patch

   1 From c2e317911f2fae424ec9a121f267e4a83efcf1c5 Mon Sep 17 00:00:00 2001
   2 From: Halton Huo <halton.huo@sun.com>
   3 Date: Wed, 19 May 2010 12:46:25 +0800
   4 Subject: [PATCH] Enhancement CanActivateSessions for OpenSolaris.
   5
   6 VT switching is always enabled on Linux, but for OpenSolaris VT switching
   7 can be truned of by 'svcadm disable vtdaemon'. So we should also check
   8 whether the service vtdaemon is online on OpenSolaris.
   9
  10 https://bugs.freedesktop.org/show_bug.cgi?id=26055
  11 ---
  12  src/Makefile.am          |    1 +
  13  src/ck-sysdeps-freebsd.c |    6 ++++++
  14  src/ck-sysdeps-linux.c   |    6 ++++++
  15  src/ck-sysdeps-solaris.c |   18 ++++++++++++++++++
  16  src/ck-sysdeps.h         |    1 +
  17  5 files changed, 32 insertions(+), 0 deletions(-)
  18
  19 diff --git a/src/Makefile.am b/src/Makefile.am
  20 index 6ab05c8..869decd 100644
  21 --- a/src/Makefile.am
  22 +++ b/src/Makefile.am
  23 @@ -49,6 +49,7 @@ if CK_COMPILE_SOLARIS
  24  libck_la_SOURCES +=            \
  25         ck-sysdeps-solaris.c    \
  26         $(NULL)
  27 +libck_la_LIBADD = -lscf
  28  endif
  29  if CK_COMPILE_FREEBSD
  30  libck_la_SOURCES +=            \
  31 diff --git a/src/ck-sysdeps-freebsd.c b/src/ck-sysdeps-freebsd.c
  32 index a30c380..df2b0f4 100644
  33 --- a/src/ck-sysdeps-freebsd.c
  34 +++ b/src/ck-sysdeps-freebsd.c
  35 @@ -361,6 +361,12 @@ done:
  36          return ret;
  37  }
  38
  39 +gboolean
  40 +ck_supports_activatable_consoles (void)
  41 +{
  42 +        return TRUE;
  43 +}
  44 +
  45  char *
  46  ck_get_console_device_for_num (guint num)
  47  {
  48 diff --git a/src/ck-sysdeps-linux.c b/src/ck-sysdeps-linux.c
  49 index 09db310..a95272e 100644
  50 --- a/src/ck-sysdeps-linux.c
  51 +++ b/src/ck-sysdeps-linux.c
  52 @@ -693,6 +693,12 @@ ck_get_max_num_consoles (guint *num)
  53          return TRUE;
  54  }
  55
  56 +gboolean
  57 +ck_supports_activatable_consoles (void)
  58 +{
  59 +        return TRUE;
  60 +}
  61 +
  62  char *
  63  ck_get_console_device_for_num (guint num)
  64  {
  65 diff --git a/src/ck-sysdeps-solaris.c b/src/ck-sysdeps-solaris.c
  66 index 335ab8b..bb37e1e 100644
  67 --- a/src/ck-sysdeps-solaris.c
  68 +++ b/src/ck-sysdeps-solaris.c
  69 @@ -33,6 +33,7 @@
  70  #ifdef HAVE_SYS_VT_H
  71  #include <sys/vt.h>
  72  #endif
  73 +#include <libscf.h>
  74
  75  #define DEV_ENCODE(M,m) ( \
  76    ( (M&0xfff) << 8)   |   ( (m&0xfff00) << 12)   |   (m&0xff)   \
  77 @@ -419,6 +420,23 @@ ck_get_max_num_consoles (guint *num)
  78          return ret;
  79  }
  80
  81 +gboolean
  82 +ck_supports_activatable_consoles (void)
  83 +{
  84 +        char *state = NULL;
  85 +        gboolean vt_enabled;
  86 +
  87 +        state = smf_get_state ("svc:/system/vtdaemon:default");
  88 +        if (state && g_str_equal (state, SCF_STATE_STRING_ONLINE)) {
  89 +                vt_enabled = TRUE;
  90 +        } else {
  91 +                vt_enabled = FALSE;
  92 +        }
  93 +
  94 +        g_free (state);
  95 +        return vt_enabled;
  96 +}
  97 +
  98  char *
  99  ck_get_console_device_for_num (guint num)
 100  {
 101 diff --git a/src/ck-sysdeps.h b/src/ck-sysdeps.h
 102 index c3f3756..8f22d52 100644
 103 --- a/src/ck-sysdeps.h
 104 +++ b/src/ck-sysdeps.h
 105 @@ -61,6 +61,7 @@ gboolean     ck_fd_is_a_console               (int             fd);
 106  gboolean     ck_is_root_user                  (void);
 107
 108  gboolean     ck_get_max_num_consoles          (guint          *num);
 109 +gboolean     ck_supports_activatable_consoles (void);
 110
 111  char *       ck_get_console_device_for_num    (guint           num);
 112  gboolean     ck_get_console_num_from_device   (const char     *device,
 113 --
 114 1.5.6.5
 115
 116 --- ConsoleKit-0.4.1/src/ck-seat.c-orig 2011-02-07 22:09:46.085393510 -0600
 117 +++ ConsoleKit-0.4.1/src/ck-seat.c      2011-02-07 22:10:58.766029875 -0600
 118 @@ -1172,6 +1172,10 @@ ck_seat_can_activate_sessions (CkSeat
 119  {
 120          g_return_val_if_fail (CK_IS_SEAT (seat), FALSE);
 121
 122 +        if (ck_supports_activatable_consoles () == FALSE) {
 123 +                return FALSE;
 124 +        }
 125 +
 126          if (can_activate != NULL) {
 127                  *can_activate = (seat->priv->kind == CK_SEAT_KIND_STATIC);
 128          }