diff options
| author | Stephane Desneux <stephane.desneux@open.eurogiciel.org> | 2014-04-12 00:08:34 +0200 |
|---|---|---|
| committer | Stephane Desneux <stephane.desneux@open.eurogiciel.org> | 2014-04-12 00:08:34 +0200 |
| commit | 6a4a7083b066c91ae09f14c822b213a89f27bcbd (patch) | |
| tree | 5b8903f3d5a2ff7935f6250864e4bf2463a6714b | |
| parent | dbfecd92a98c674e6f2c95d1662befa534782455 (diff) | |
| download | meta-6a4a7083b066c91ae09f14c822b213a89f27bcbd.tar.gz meta-6a4a7083b066c91ae09f14c822b213a89f27bcbd.tar.bz2 meta-6a4a7083b066c91ae09f14c822b213a89f27bcbd.zip | |
generic-wayland: revert to sleep method to defer user session start
Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
| -rw-r--r-- | scripts/generic-wayland.post | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/scripts/generic-wayland.post b/scripts/generic-wayland.post index 67ca4d5..09edd0d 100644 --- a/scripts/generic-wayland.post +++ b/scripts/generic-wayland.post @@ -18,23 +18,20 @@ for user in app alice bob carol guest; do done # user sessions must start after graphical target -patch -p1 -d/ <<'EOF' ---- bad/lib/systemd/system/user-session-launch@.service 2014-04-11 03:51:54.651484824 -0700 -+++ good/lib/systemd/system/user-session-launch@.service 2014-04-11 03:44:28.016532732 -0700 -@@ -1,10 +1,10 @@ - [Unit] - Description=User Session Launcher --After=systemd-user-sessions.service systemd-logind.service --Requires=systemd-logind.service -+After=systemd-user-sessions.service systemd-logind.service display-manager.service -+Requires=systemd-logind.service display-manager.service - - [Service] --ExecStart=/usr/bin/user-session-launch %i -+ExecStart=/usr/bin/wl-pre "/usr/bin/user-session-launch %i" - - [Install] - WantedBy=graphical.target +cat >/usr/lib/systemd/system/user-session-launch@.service << EOF +[Unit] +Description=User Session Launcher +After=systemd-user-sessions.service systemd-logind.service display-manager.service +Requires=systemd-logind.service display-manager.service + +[Service] +ExecStartPre=/usr/bin/sleep 3 +ExecStart=/usr/bin/user-session-launch %i +#ExecStart=/usr/bin/wl-pre "/usr/bin/user-session-launch %i" +#Environment=XDG_RUNTIME_DIR=/run/display + +[Install] +WantedBy=graphical.target EOF # clean weston target inside user session (installed by weston) |