server/client/packaging: change socket_name to wayland-0 from headless-0, fix pepper...

Change-Id: I534b34fae2636dbf5e441af35e2f450628afc1fc
Signed-off-by: Sung-Jin Park <sj76.park@samsung.com>

diff --git a/data/doctor/units/display-manager-ready.path b/data/doctor/units/display-manager-ready.path
deleted file mode 100644 (file)
index 24357bd..0000000
--- a/data/doctor/units/display-manager-ready.path
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Path activation for display manager ready service
-After=tmp.mount display-manager.service
-
-[Path]
-PathExists=/run/wayland-0

diff --git a/data/doctor/units/display-manager-ready.service b/data/doctor/units/display-manager-ready.service
deleted file mode 100644 (file)
index 00ac10b..0000000
--- a/data/doctor/units/display-manager-ready.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Headless Display Manager Ready Service
-After=tmp.mount display-manager.service
-
-[Service]
-Type=oneshot
-EnvironmentFile=/etc/sysconfig/display-manager.env
-SmackProcessLabel=System
-ExecStart=/usr/bin/sh -c "while [ ! -e /run/wayland-0 ] ; do /usr/bin/sleep .1 ; done ;/bin/chown -f root:display /run/wayland-0;/bin/chmod 775 /run/wayland-0"
-ExecStartPost=/usr/bin/sh -c "/usr/bin/touch /run/.wm_ready"
-
-[Install]
-WantedBy=graphical.target

diff --git a/data/doctor/units/display-manager.env b/data/doctor/units/display-manager.env
deleted file mode 100644 (file)
index dc45551..0000000
--- a/data/doctor/units/display-manager.env
+++ /dev/null
@@ -1,3 +0,0 @@
-TBM_DISPLAY_SERVER=1
-WAYLAND_DISPLAY="wayland-0"
-XDG_RUNTIME_DIR=/run

diff --git a/data/doctor/units/display-manager.service b/data/doctor/units/display-manager.service
deleted file mode 100644 (file)
index 7401b97..0000000
--- a/data/doctor/units/display-manager.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Headless Display Manager
-
-[Service]
-Type=simple
-EnvironmentFile=/etc/sysconfig/display-manager.env
-SmackProcessLabel=System
-ExecStart=/usr/bin/doctor
-
-[Install]
-WantedBy=graphical.target

diff --git a/data/doctor/units/display-user.service b/data/doctor/units/display-user.service
deleted file mode 100644 (file)
index 392df83..0000000
--- a/data/doctor/units/display-user.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Creating a link file for user to access display manager socket
-DefaultDependencies=no
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/sh -c "while [ ! -e /run/wayland-0 ] ; do /usr/bin/sleep .1 ; done ;/usr/bin/ln -sf /run/wayland-0 /run/user/%U/"

diff --git a/data/doctor/units/display_env.sh b/data/doctor/units/display_env.sh
deleted file mode 100644 (file)
index 6b25629..0000000
--- a/data/doctor/units/display_env.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-if [ "$USER" == "root" ]; then
-        export XDG_RUNTIME_DIR=/run
-else
-        export XDG_RUNTIME_DIR=/run/user/$UID
-fi
-if [ "$WAYALND_DISPLAY" = "" ]; then
-        export WAYLAND_DISPLAY=wayland-0
-fi

diff --git a/data/headless/units/display-manager-ready.path b/data/headless/units/display-manager-ready.path
deleted file mode 100644 (file)
index bbbe8fb..0000000
--- a/data/headless/units/display-manager-ready.path
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Path activation for display manager ready service
-After=tmp.mount display-manager.service
-
-[Path]
-PathExists=/run/headless-0

diff --git a/data/headless/units/display-manager-ready.service b/data/headless/units/display-manager-ready.service
deleted file mode 100644 (file)
index 43779e3..0000000
--- a/data/headless/units/display-manager-ready.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Headless Display Manager Ready Service
-After=tmp.mount display-manager.service
-
-[Service]
-Type=oneshot
-EnvironmentFile=/etc/sysconfig/display-manager.env
-SmackProcessLabel=System
-ExecStart=/usr/bin/sh -c "while [ ! -e /run/headless-0 ] ; do /usr/bin/sleep .1 ; done ;/bin/chown -f root:display /run/headless-0;/bin/chmod 775 /run/headless-0"
-ExecStartPost=/usr/bin/sh -c "/usr/bin/touch /run/.wm_ready"
-
-[Install]
-WantedBy=graphical.target

diff --git a/data/headless/units/display-manager.env b/data/headless/units/display-manager.env
deleted file mode 100644 (file)
index 2c356e3..0000000
--- a/data/headless/units/display-manager.env
+++ /dev/null
@@ -1,3 +0,0 @@
-TBM_DISPLAY_SERVER=1
-WAYLAND_DISPLAY="headless-0"
-XDG_RUNTIME_DIR=/run

diff --git a/data/headless/units/display-manager.service b/data/headless/units/display-manager.service
deleted file mode 100644 (file)
index 35ecc6b..0000000
--- a/data/headless/units/display-manager.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Headless Display Manager
-
-[Service]
-Type=simple
-EnvironmentFile=/etc/sysconfig/display-manager.env
-SmackProcessLabel=System
-ExecStart=/usr/bin/headless_server
-
-[Install]
-WantedBy=graphical.target

diff --git a/data/headless/units/display-user.service b/data/headless/units/display-user.service
deleted file mode 100644 (file)
index 9c55463..0000000
--- a/data/headless/units/display-user.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Creating a link file for user to access display manager socket
-DefaultDependencies=no
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/sh -c "while [ ! -e /run/headless-0 ] ; do /usr/bin/sleep .1 ; done ;/usr/bin/ln -sf /run/headless-0 /run/user/%U/"

diff --git a/data/headless/units/display_env.sh b/data/headless/units/display_env.sh
deleted file mode 100644 (file)
index 56a32a9..0000000
--- a/data/headless/units/display_env.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-if [ "$USER" == "root" ]; then
-        export XDG_RUNTIME_DIR=/run
-else
-        export XDG_RUNTIME_DIR=/run/user/$UID
-fi
-if [ "$WAYALND_DISPLAY" = "" ]; then
-        export WAYLAND_DISPLAY=headless-0
-fi

diff --git a/data/units/display-manager-ready.path b/data/units/display-manager-ready.path
new file mode 100644 (file)
index 0000000..24357bd
--- /dev/null
+++ b/data/units/display-manager-ready.path
@@ -0,0 +1,6 @@
+[Unit]
+Description=Path activation for display manager ready service
+After=tmp.mount display-manager.service
+
+[Path]
+PathExists=/run/wayland-0

diff --git a/data/units/display-manager-ready.service b/data/units/display-manager-ready.service
new file mode 100644 (file)
index 0000000..00ac10b
--- /dev/null
+++ b/data/units/display-manager-ready.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Headless Display Manager Ready Service
+After=tmp.mount display-manager.service
+
+[Service]
+Type=oneshot
+EnvironmentFile=/etc/sysconfig/display-manager.env
+SmackProcessLabel=System
+ExecStart=/usr/bin/sh -c "while [ ! -e /run/wayland-0 ] ; do /usr/bin/sleep .1 ; done ;/bin/chown -f root:display /run/wayland-0;/bin/chmod 775 /run/wayland-0"
+ExecStartPost=/usr/bin/sh -c "/usr/bin/touch /run/.wm_ready"
+
+[Install]
+WantedBy=graphical.target

diff --git a/data/units/display-manager.env b/data/units/display-manager.env
new file mode 100644 (file)
index 0000000..dc45551
--- /dev/null
+++ b/data/units/display-manager.env
@@ -0,0 +1,3 @@
+TBM_DISPLAY_SERVER=1
+WAYLAND_DISPLAY="wayland-0"
+XDG_RUNTIME_DIR=/run

diff --git a/data/units/display-manager.service.doctor b/data/units/display-manager.service.doctor
new file mode 100644 (file)
index 0000000..7401b97
--- /dev/null
+++ b/data/units/display-manager.service.doctor
@@ -0,0 +1,11 @@
+[Unit]
+Description=Headless Display Manager
+
+[Service]
+Type=simple
+EnvironmentFile=/etc/sysconfig/display-manager.env
+SmackProcessLabel=System
+ExecStart=/usr/bin/doctor
+
+[Install]
+WantedBy=graphical.target

diff --git a/data/units/display-manager.service.headless b/data/units/display-manager.service.headless
new file mode 100644 (file)
index 0000000..35ecc6b
--- /dev/null
+++ b/data/units/display-manager.service.headless
@@ -0,0 +1,11 @@
+[Unit]
+Description=Headless Display Manager
+
+[Service]
+Type=simple
+EnvironmentFile=/etc/sysconfig/display-manager.env
+SmackProcessLabel=System
+ExecStart=/usr/bin/headless_server
+
+[Install]
+WantedBy=graphical.target

diff --git a/data/units/display-user.service b/data/units/display-user.service
new file mode 100644 (file)
index 0000000..392df83
--- /dev/null
+++ b/data/units/display-user.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Creating a link file for user to access display manager socket
+DefaultDependencies=no
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/sh -c "while [ ! -e /run/wayland-0 ] ; do /usr/bin/sleep .1 ; done ;/usr/bin/ln -sf /run/wayland-0 /run/user/%U/"

diff --git a/data/units/display_env.sh b/data/units/display_env.sh
new file mode 100644 (file)
index 0000000..6b25629
--- /dev/null
+++ b/data/units/display_env.sh
@@ -0,0 +1,8 @@
+if [ "$USER" == "root" ]; then
+        export XDG_RUNTIME_DIR=/run
+else
+        export XDG_RUNTIME_DIR=/run/user/$UID
+fi
+if [ "$WAYALND_DISPLAY" = "" ]; then
+        export WAYLAND_DISPLAY=wayland-0
+fi

diff --git a/packaging/pepper.spec b/packaging/pepper.spec
index eec2882a41da4e81df0be7290b868f73dc33f418..c1bce7f8e7297a556d27625a51fe1988bdf93f27 100644 (file)
--- a/packaging/pepper.spec
+++ b/packaging/pepper.spec
@@ -297,25 +297,20 @@ make %{?_smp_mflags}
 
 # install system session services
 %__mkdir_p %{buildroot}%{_unitdir}
-install -m 644 data/doctor/units/display-manager.service %{buildroot}%{_unitdir}
-install -m 644 data/doctor/units/display-manager-ready.path %{buildroot}%{_unitdir}
-install -m 644 data/doctor/units/display-manager-ready.service %{buildroot}%{_unitdir}
-install -m 644 data/headless/units/display-manager.service %{buildroot}%{_unitdir}
-install -m 644 data/headless/units/display-manager-ready.path %{buildroot}%{_unitdir}
-install -m 644 data/headless/units/display-manager-ready.service %{buildroot}%{_unitdir}
+install -m 644 data/units/display-manager.service.doctor %{buildroot}%{_unitdir}
+install -m 644 data/units/display-manager.service.headless %{buildroot}%{_unitdir}
+install -m 644 data/units/display-manager-ready.path %{buildroot}%{_unitdir}
+install -m 644 data/units/display-manager-ready.service %{buildroot}%{_unitdir}
 
 # install user session service
 %__mkdir_p %{buildroot}%{_unitdir_user}
-install -m 644 data/doctor/units/display-user.service %{buildroot}%{_unitdir_user}
-install -m 644 data/headless/units/display-user.service %{buildroot}%{_unitdir_user}
+install -m 644 data/units/display-user.service %{buildroot}%{_unitdir_user}
 
 # install env file and scripts for service
 %__mkdir_p %{buildroot}%{_sysconfdir}/sysconfig
-install -m 0644 data/doctor/units/display-manager.env %{buildroot}%{_sysconfdir}/sysconfig
-install -m 0644 data/headless/units/display-manager.env %{buildroot}%{_sysconfdir}/sysconfig
+install -m 0644 data/units/display-manager.env %{buildroot}%{_sysconfdir}/sysconfig
 %__mkdir_p %{buildroot}%{_sysconfdir}/profile.d
-install -m 0644 data/doctor/units/display_env.sh %{buildroot}%{_sysconfdir}/profile.d
-install -m 0644 data/headless/units/display_env.sh %{buildroot}%{_sysconfdir}/profile.d
+install -m 0644 data/units/display_env.sh %{buildroot}%{_sysconfdir}/profile.d
 
 %post -n %{name} -p /sbin/ldconfig
 %postun -n %{name} -p /sbin/ldconfig
@@ -356,6 +351,14 @@ getent group %{display_group} >/dev/null || %{_sbindir}/groupadd -r -o %{display
 # create user 'display'
 getent passwd %{display_user} >/dev/null || %{_sbindir}/useradd -r -g %{display_group} -d /run/display -s /bin/false -c "Display" %{display_user}
 
+# create links within systemd's target(s)
+%__mkdir_p %{_unitdir}/graphical.target.wants/
+%__mkdir_p %{_unitdir_user}/basic.target.wants/
+mv -f %{_unitdir}/display-manager.service.doctor %{_unitdir}/display-manager.service
+ln -sf ../display-manager.service %{_unitdir}/graphical.target.wants/
+ln -sf ../display-manager-ready.service %{_unitdir}/graphical.target.wants/
+ln -sf ../display-user.service %{_unitdir_user}/basic.target.wants/
+
 %pre headless
 # create groups 'display'
 getent group %{display_group} >/dev/null || %{_sbindir}/groupadd -r -o %{display_group}
@@ -365,6 +368,7 @@ getent passwd %{display_user} >/dev/null || %{_sbindir}/useradd -r -g %{display_
 # create links within systemd's target(s)
 %__mkdir_p %{_unitdir}/graphical.target.wants/
 %__mkdir_p %{_unitdir_user}/basic.target.wants/
+mv -f %{_unitdir}/display-manager.service.headless %{_unitdir}/display-manager.service
 ln -sf ../display-manager.service %{_unitdir}/graphical.target.wants/
 ln -sf ../display-manager-ready.service %{_unitdir}/graphical.target.wants/
 ln -sf ../display-user.service %{_unitdir_user}/basic.target.wants/
@@ -567,7 +571,7 @@ rm -f %{_unitdir_user}/basic.target.wants/display-user.service
 %{_bindir}/doctor*
 %{_unitdir}/display-manager-ready.path
 %{_unitdir}/display-manager-ready.service
-%{_unitdir}//display-manager.service
+%{_unitdir}/display-manager.service.doctor
 %{_unitdir_user}/display-user.service
 %config %{_sysconfdir}/sysconfig/display-manager.env
 %config %{_sysconfdir}/profile.d/display_env.sh
@@ -579,7 +583,7 @@ rm -f %{_unitdir_user}/basic.target.wants/display-user.service
 %{_bindir}/headless*
 %{_unitdir}/display-manager-ready.path
 %{_unitdir}/display-manager-ready.service
-%{_unitdir}/display-manager.service
+%{_unitdir}/display-manager.service.headless
 %{_unitdir_user}/display-user.service
 %config %{_sysconfdir}/sysconfig/display-manager.env
 %config %{_sysconfdir}/profile.d/display_env.sh

diff --git a/src/bin/headless/headless_server.c b/src/bin/headless/headless_server.c
index 976ffac8f5c4b6e35bf9d1568a919462664cc3c1..199ee7d5d3ed2510a4ce264284e9ba2e7e52075c 100644 (file)
--- a/src/bin/headless/headless_server.c
+++ b/src/bin/headless/headless_server.c
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
        socket_name = getenv("WAYLAND_DISPLAY");
 
        if (!socket_name)
-               socket_name = "headless-0";
+               socket_name = "wayland-0";
 
        if (!getenv("XDG_RUNTIME_DIR"))
                setenv("XDG_RUNTIME_DIR", "/run", 1);

diff --git a/src/samples/headless_client.c b/src/samples/headless_client.c
index 96972dfe14886a73f45748ebc315987bd45e2b57..36e7550c2dd25ead13a4538fc00e9ea852f2ee88 100644 (file)
--- a/src/samples/headless_client.c
+++ b/src/samples/headless_client.c
@@ -6,7 +6,6 @@
 #include <wayland-tbm-client.h>
 #include <tbm_surface_internal.h>
 
-#define DISPLAY_NAME "headless-0"
 #define MAX_STR 1024
 
 #define DEBUG
@@ -509,6 +508,7 @@ int main(int argc, char **argv)
 {
        int x, y, w, h;
        app_data_t *client = NULL;
+       const char *socket_name = NULL;
        Eina_Bool focus_skip = EINA_FALSE;
 
        setvbuf(stdout, NULL, _IONBF, 0);
@@ -517,6 +517,11 @@ int main(int argc, char **argv)
        if (getenv("HEADLESS_SKIP_FOCUS"))
                focus_skip = EINA_TRUE;
 
+       socket_name = getenv("WAYLAND_DISPLAY");
+
+        if (!socket_name)
+                socket_name = "wayland-0";
+
        client = (app_data_t *)calloc(1, sizeof(app_data_t));
        ERROR_CHECK(client, goto shutdown, "Failed to allocate memory for app_data_t");
 
@@ -526,8 +531,8 @@ int main(int argc, char **argv)
                goto shutdown;
        }
 
-       client->ewd = ecore_wl2_display_connect(DISPLAY_NAME);
-       ERROR_CHECK(client->ewd, goto shutdown, "Failed to connect to wayland display %s", DISPLAY_NAME);
+       client->ewd = ecore_wl2_display_connect(socket_name);
+       ERROR_CHECK(client->ewd, goto shutdown, "Failed to connect to wayland display %s", socket_name);
 
        client->wl_tbm_client = wayland_tbm_client_init(ecore_wl2_display_get(client->ewd));
        ERROR_CHECK(client->wl_tbm_client, goto shutdown, "Failed to init wayland_tbm_client");