Rename tbm-drm socket

Change-Id: I77efcdb77ec54ea9b744576724362224b726e861

diff --git a/service/tbm-drm-user.path b/service/tbm-drm-user.path
index ede1f1b..8525e86 100644 (file)
--- a/service/tbm-drm-user.path
+++ b/service/tbm-drm-user.path
@@ -2,4 +2,4 @@
 Description=Wait for tbm-drm display daemon socket
 
 [Path]
-PathExists=/run/tbm_drm
+PathExists=/run/tbm-drm

diff --git a/service/tbm-drm-user.service b/service/tbm-drm-user.service
index b0ca295..3fae24a 100644 (file)
--- a/service/tbm-drm-user.service
+++ b/service/tbm-drm-user.service
@@ -1,6 +1,6 @@
 [Unit]
-Description=Creating a link file for user to access tbm_drm
+Description=Creating a link file for user to access tbm-drm
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/ln -sf /run/tbm_drm /run/user/%U/
+ExecStart=/usr/bin/ln -sf /run/tbm-drm /run/user/%U/

diff --git a/service/tbm-drm.path b/service/tbm-drm.path
index c0cd484..c8742b4 100644 (file)
--- a/service/tbm-drm.path
+++ b/service/tbm-drm.path
@@ -2,4 +2,4 @@
 Description=Wait for tbm_drm daemon socket
 
 [Path]
-PathExists=/run/tbm_drm
+PathExists=/run/tbm-drm

diff --git a/service/tbm-drm.service b/service/tbm-drm.service
index 435aea1..dabeeaf 100644 (file)
--- a/service/tbm-drm.service
+++ b/service/tbm-drm.service
@@ -1,11 +1,11 @@
 [Unit]
-Description=Display manager setup service
+Description= tbm-drm setup service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/chmod g+w /run/tbm_drm
-ExecStart=/usr/bin/chgrp display /run/tbm_drm
-ExecStart=/usr/bin/chsmack -a User /run/tbm_drm
+ExecStart=/usr/bin/chmod g+w /run/tbm-drm
+ExecStart=/usr/bin/chgrp display /run/tbm-drm
+ExecStart=/usr/bin/chsmack -a User /run/tbm-drm
 
 [Install]
 WantedBy=graphical.target

diff --git a/src/tbm_drm_helper_client.c b/src/tbm_drm_helper_client.c
index 1965c8f..d0a3f50 100644 (file)
--- a/src/tbm_drm_helper_client.c
+++ b/src/tbm_drm_helper_client.c
@@ -96,7 +96,7 @@ tbm_drm_helper_get_auth_info(int *auth_fd, char **device, uint32_t *capabilities
 
        tbm_drm_client->auth_fd = -1;
 
-       display = wl_display_connect("tbm_drm");
+       display = wl_display_connect("tbm-drm");
        if (!display) {
                TBM_LOG("Failed to connect display\n");
                free(tbm_drm_client);

diff --git a/src/tbm_drm_helper_server.c b/src/tbm_drm_helper_server.c
index cd4b1ff..f8dffd2 100644 (file)
--- a/src/tbm_drm_helper_server.c
+++ b/src/tbm_drm_helper_server.c
@@ -163,7 +163,7 @@ tbm_drm_helper_wl_server_init(void *wl_display,   int fd, const char *device_nam
                tbm_drm_srv->fd = fd;
                tbm_drm_srv->flags = flags;
 
-               if(wl_display_add_socket(tbm_drm_srv->display, "tbm_drm")) {
+               if(wl_display_add_socket(tbm_drm_srv->display, "tbm-drm")) {
                        TBM_LOG("[TBM_DRM] fail to add socket\n");
 
                        if (tbm_drm_srv->device_name)