generic-wayland: remove sleep delay

Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>

diff --git a/scripts/generic-base.post b/scripts/generic-base.post
index b60756f..3ce69b3 100644 (file)
--- a/scripts/generic-base.post
+++ b/scripts/generic-base.post
@@ -59,7 +59,7 @@ if [ -e /etc/sysconfig/i18n -a ! -e /etc/locale.conf ]; then
 fi
 
 # workaround for bug PTREL-763
-patch -p1 -d/ <<'EOF'
+patch -b -p1 -d/ <<'EOF'
 --- bad/etc/pam.d/systemd-user 2014-03-20 10:01:36.657843073 +0100
 +++ good/etc/pam.d/systemd-user 2014-03-20 10:06:51.586121696 +0100
 @@ -4,5 +4,6 @@
@@ -72,7 +72,7 @@ patch -p1 -d/ <<'EOF'
 EOF
 
 # extra fix to avoid root and display sessions
-patch -p1 -d/ <<'EOF'
+patch -b -p1 -d/ <<'EOF'
 --- bad/etc/pam.d/system-auth  2014-04-07 06:16:51.888018876 -0700
 +++ good/etc/pam.d/system-auth 2014-04-07 06:16:46.335018503 -0700
 @@ -11,7 +11,6 @@

diff --git a/scripts/generic-wayland.post b/scripts/generic-wayland.post
index cf61f6f..33774c7 100644 (file)
--- a/scripts/generic-wayland.post
+++ b/scripts/generic-wayland.post
@@ -18,21 +18,19 @@ for user in app alice bob carol guest; do
 done
 
 # user sessions must start after graphical target
-# WARNING: this overwrites the file distributed in RPM user-session-units
-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.path
-Requires=systemd-logind.service display-manager.path
-
-[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
+patch -b -p1 -d/ <<'EOF'
+--- /lib/systemd/system/user-session-launch@.service.orig      2014-03-17 17:50:18.000000000 -0700
++++ /lib/systemd/system/user-session-launch@.service   2014-04-15 06:03:45.555682575 -0700
+@@ -1,7 +1,7 @@
+ [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.path
++Requires=systemd-logind.service display-manager.path
+ 
+ [Service]
+ ExecStart=/usr/bin/user-session-launch %i
 EOF
 
 # clean weston target inside user session (installed by weston)