summaryrefslogtreecommitdiff
path: root/src/lib/ecore_drm/ecore_drm_launcher.c
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2015-01-19 12:55:50 -0500
committerChris Michael <cp.michael@samsung.com>2015-01-19 12:55:50 -0500
commit205430ceb4cea6a21e0d5775796ff90d7ebf29c3 (patch)
tree6690c7c0aa1b34654bdc74f8d13f6b815ba964f9 /src/lib/ecore_drm/ecore_drm_launcher.c
parent28e4901d041e087f505c19bc9733ef22d31addf0 (diff)
Revert "ecore-drm: Don't init tty unless we are Not using systemd"
This reverts commit 28e4901d041e087f505c19bc9733ef22d31addf0. This broke vt switching in drm so revert (for now) until we get the systemd vt and setup handlers
Diffstat (limited to 'src/lib/ecore_drm/ecore_drm_launcher.c')
-rw-r--r--src/lib/ecore_drm/ecore_drm_launcher.c20
1 files changed, 5 insertions, 15 deletions
diff --git a/src/lib/ecore_drm/ecore_drm_launcher.c b/src/lib/ecore_drm/ecore_drm_launcher.c
index 8b08e3ceb7..41f2fe1b50 100644
--- a/src/lib/ecore_drm/ecore_drm_launcher.c
+++ b/src/lib/ecore_drm/ecore_drm_launcher.c
@@ -123,15 +123,10 @@ ecore_drm_launcher_connect(Ecore_Drm_Device *dev)
123 } 123 }
124 } 124 }
125 125
126 /* NB: Hmmm, appears we don't need to open a tty if we are running 126 if (!ecore_drm_tty_open(dev, NULL))
127 * with systemd support */
128 if (!logind)
129 { 127 {
130 if (!ecore_drm_tty_open(dev, NULL)) 128 ERR("Launcher: failed to open tty\n");
131 { 129 return EINA_FALSE;
132 ERR("Launcher: failed to open tty\n");
133 return EINA_FALSE;
134 }
135 } 130 }
136 131
137 /* setup handler for signals */ 132 /* setup handler for signals */
@@ -158,13 +153,8 @@ ecore_drm_launcher_disconnect(Ecore_Drm_Device *dev)
158 if (dev->tty.switch_hdlr) ecore_event_handler_del(dev->tty.switch_hdlr); 153 if (dev->tty.switch_hdlr) ecore_event_handler_del(dev->tty.switch_hdlr);
159 dev->tty.switch_hdlr = NULL; 154 dev->tty.switch_hdlr = NULL;
160 155
161 /* NB: Hmmm, appears we don't need to open a tty if we are running 156 if (!ecore_drm_tty_close(dev))
162 * with systemd support */ 157 ERR("Launcher: failed to close tty\n");
163 if (!logind)
164 {
165 if (!ecore_drm_tty_close(dev))
166 ERR("Launcher: failed to close tty\n");
167 }
168 158
169 if (logind) 159 if (logind)
170 { 160 {