diff options
| author | Stephane Desneux <stephane.desneux@open.eurogiciel.org> | 2014-04-11 10:54:41 +0200 |
|---|---|---|
| committer | Stephane Desneux <stephane.desneux@open.eurogiciel.org> | 2014-04-11 10:54:41 +0200 |
| commit | 91ce6d9e8f0aa08864b492926b129206c8d30242 (patch) | |
| tree | 84ba66688fb6133ee40322834c5778195cff3d77 | |
| parent | a69a47cea030316bca6e2fc2d0d97d639f6537a1 (diff) | |
| download | weston-common-91ce6d9e8f0aa08864b492926b129206c8d30242.tar.gz weston-common-91ce6d9e8f0aa08864b492926b129206c8d30242.tar.bz2 weston-common-91ce6d9e8f0aa08864b492926b129206c8d30242.zip | |
start tz-launcher (user minishell) at session startup
Change-Id: I5230f72ba59f628e296495aabc71283d304579f9
Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
| -rw-r--r-- | packaging/weston-generic.spec | 11 | ||||
| -rw-r--r-- | weston-terminal.desktop | 6 | ||||
| -rw-r--r-- | weston-user.service | 3 |
3 files changed, 16 insertions, 4 deletions
diff --git a/packaging/weston-generic.spec b/packaging/weston-generic.spec index 5ce40d6..bebd617 100644 --- a/packaging/weston-generic.spec +++ b/packaging/weston-generic.spec @@ -36,7 +36,7 @@ ExclusiveArch: ############ tz-launcher %package tz-launcher -Summary: A small launcher for Wayland compositors. +Summary: A small launcher for Wayland compositors %description tz-launcher A small launcher for Wayland compositors @@ -107,6 +107,10 @@ cat >%{buildroot}%{_sysconfdir}/udev/rules.d/99-tty.rules <<'EOF' SUBSYSTEM=="tty", KERNEL=="tty1", GROUP="display", OWNER="display" EOF +# install desktop file +mkdir -p %{buildroot}%{_datadir}/applications +install -m 0644 weston-terminal.desktop %{buildroot}%{_datadir}/applications + %pre # create groups 'display' and 'weston-launch' getent group display >/dev/null || %{_sbindir}/groupadd -r -o display @@ -117,11 +121,11 @@ getent passwd display >/dev/null || %{_sbindir}/useradd -r -g display -G weston- # setup display manager service mkdir -p %{_unitdir}/graphical.target.wants/ -ln -s ../display-manager.path %{_unitdir}/graphical.target.wants/ +ln -sf ../display-manager.path %{_unitdir}/graphical.target.wants/ # setup display manager access (inside user session) mkdir -p %{_unitdir_user}/default.target.wants/ -ln -s ../weston-user.service %{_unitdir_user}/default.target.wants/ +ln -sf ../weston-user.service %{_unitdir_user}/default.target.wants/ %files %manifest %{name}.manifest @@ -135,6 +139,7 @@ ln -s ../weston-user.service %{_unitdir_user}/default.target.wants/ %{_unitdir_user}/weston-user.service %config %{_sysconfdir}/profile.d/* %config %{_sysconfdir}/udev/rules.d/* +%{_datadir}/applications/*.desktop %files config %manifest %{name}.manifest diff --git a/weston-terminal.desktop b/weston-terminal.desktop new file mode 100644 index 0000000..e686f7c --- /dev/null +++ b/weston-terminal.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=Weston-Terminal +Type=Application +Exec=/usr/bin/weston-terminal +Icon=/usr/share/weston/terminal.png + diff --git a/weston-user.service b/weston-user.service index 2fceb86..a64e7d1 100644 --- a/weston-user.service +++ b/weston-user.service @@ -2,7 +2,8 @@ Description=Shared weston session [Service] -ExecStart=/usr/bin/ln -s /run/display/wayland-0 /run/user/%U/ +ExecStartPre=/usr/bin/ln -s /run/display/wayland-0 /run/user/%U/ +ExecStart=/usr/bin/tz-launcher /usr/share/applications/weston-terminal.desktop [Install] WantedBy=default.target |